First arounding.
Merge branch 'master' of https://github.com/QAston/hackathon

Conflicts:
	appmine.js