I totall forget what I've done here
Merge branch 'master' of https://github.com/ncw000/Scratch

Conflicts:
	public/index.html