Added the backend for profile page things
Added to users controller
Merge branch 'master' of https://github.com/jdl39/HappinessTracker
Changes to users controller
Replaced @user with current_user