# Conflicts:
#	backend/models/user.js
#	frontend/src/App.js
#	frontend/src/actions/Login.actions.js

Feature/modify profile

See merge request !4

# Conflicts:
#   frontend/src/containers/Profile.container.js
#   frontend/src/containers/SignUp.container.js

 sample.sql modified

See merge request !1