updating page
merge branch 'master' of https://github.com/danbjoseph/sideprojects
Conflicts:
	london_to_brighton/index.html
	london_to_brighton/js/main.js