Deleted Bunny, added other files
Updates
updated player.js/coffee
Merge branch 'master' of https://github.com/ChemicalWonders/CodeDay2014
throwing out old code
updated tiles set
merged
merge conflict
Delete bunny2.png.jpg
Alex's commits
Merge branch 'master' of https://github.com/ChemicalWonders/UCR_CodeDay2014
Update game.js
Delete bunny.png
Delete bunny.png.jpg
integration phase one
Delete gameWASD.js
Delete gamev2.js
Delete objectmanager.js
Delete object.js
more