added collision check, refactored code
added collision check, refactored code
Merge origin/master

Conflicts:
	public_html/examples/tanks/js/tanks.js
Merge origin/master

Conflicts:
	public_html/examples/tanks/js/tanks.js