Initial bomb dropping functionality
Fixed merge conflict
Initial bomb dropping
Merge branch 'master' of https://github.com/clee0/Bomberman

Conflicts:
	gameScript.js
	images/bombs/Thumbs.db