created user profile page
Merge branch 'master' of https://github.com/tatalala/Thirsty
user profile and settings
resolved merge conflicts and added user profile and settings
user profile page, setting and merged conflicts
merge conflict to navbar