Works!
Merge branch 'master' of https://github.com/skyser2003/tower_defense

Conflicts:
	js/main.js