minor changes. moved edit profile button
Merge branch 'master' into alex
fixing modals
Merge pull request #28 from afalsario/afalsario

fixing modals
Edited navbar, added pagination, default image title for gallery.
Merge pull request #30 from afalsario/anthony

Anthony
Conflicts resolved
conflict resolved
Merge pull request #29 from afalsario/alex

Alex committing changes