Pre-merge commit
Merge branch 'master' of https://github.com/pollstagram/pollstagram
Started on display of user account info
Added basic display of user information
Cleaned up navbar (removed placeholder links)