Version number and author at the bottom of the page
Merge branch 'master' into gh-pages

Conflicts:
	dist/js/app.js