changed index.html
added platform + images
i dont know why i make 10 changes before i commit
resolve merge conflict 0003
fixed merge problems?
Merge branch 'master' of https://github.com/ChemicalWonders/CodeDay2014

Conflicts:
	src/game.js