Added content to photos page
Merge branch 'master' of https://github.com/AdriennePind/fish-journey into photos-page

Conflicts:
	www/css/style.css
	www/js/controllers.js
	www/templates/tab-profile.html
Merge pull request #8 from AdriennePind/photos-page

Photos page