# Conflicts:
#	src/router.js
#	src/routes/Index.js

# Conflicts:
#	src/models/user.js

# Conflicts:
#	src/models/user.js

# Conflicts:
#	src/routes/Index.js
#	yarn.lock

# Conflicts:
#	src/index.js
#	src/routes/Activate.js
#	src/routes/Login.js
#	src/routes/Profiles.js