.
Merge branch 'master' of https://github.com/araymer/SomeTowerDefense.git

Conflicts:
	src/Model/Ticker.java