nav
Merge branch 'master' of github.com:keltroth/photos
yo
Conflicts:
	navigation.php
Merge branch 'master' of github.com:keltroth/photos
corrects non slashed urls