a lot of stuff
Merge branch 'master' into show-page-change

Conflicts:
	app/views/shared/_footer.html
Merge pull request #54 from tidydee/show-page-change

a lot of stuff