updates
Merge branch 'master' of https://github.com/madamsmall/ExpoGameEngine

Conflicts:
	src/Towers/FastTower.java
more playability