manual merge
Merge branch 'dev'
Merge branch 'master' of https://github.com/shrutijalewar/white-van
fixed profile bug for newly registered users
Merge pull request #6 from shrutijalewar/login

fixed profile bug for newly registered users
changed home to where if you are logged in it doesnt show the login/register forms, initmap w/ user location cntering
edit form bugs squashed
Merge pull request #7 from shrutijalewar/backend-setup

edit form bugs squashed
Merge pull request #8 from shrutijalewar/dev

acc test
put username on nav, default user photo after registration
settled merge conflict
Merge pull request #9 from shrutijalewar/views

Views
user tiles are up and link to their site
repaired merge bug(residual code)
photo upload and carousel example in user profile gallery
added dro markers to the map, added feature where subject is hidden in messages when text radio btn is focused on
Merge branch 'views'
Merge pull request #10 from shrutijalewar/views

Added mapMarkers, hide subject in send message form
added new users img dir to .gitignore
Merge pull request #11 from shrutijalewar/backend-setup

Backend setup