Merge pull request #1 from Sidnah/master

merging after gitignore
creating an account
showing user profile

/users/show/id
adding logout
Merge branch 'master' of https://github.com/Sidnah/happ into dev
Merge branch 'dev' of https://github.com/Sidnah/happ into dev
fixed
Follow/Unfollow
Merge pull request #2 from Sidnah/HAPP-8

Follow/Unfollow
Merge pull request #3 from Sidnah/dev

Dev