gallery working
navigations
Merge branch 'master' of https://github.com/shangsunset/joyceful

Conflicts:
	photography/views.py
	static/css/main.css
	static/js/main.js
	templates/photography/includes/base.html
	templates/photography/photos_by_location.html