Small change for layouts and current_user over @user.
Merge branch 'master' of https://github.com/jdl39/HappinessTracker
Put tabs into partial.
Merge branch 'master' of https://github.com/jdl39/HappinessTracker