minor changes. moved edit profile button
Merge branch 'master' into alex
Edited navbar, added pagination, default image title for gallery.
Conflicts resolved
conflict resolved
Merge pull request #29 from afalsario/alex

Alex committing changes