change
Merge branch 'master' of https://github.com/JamesRGallagher/HackLancs

Conflicts:
	hack/www/app.js