Corrected some issues.
Merge branch 'Towers'

Conflicts:
	desktop/robotsvsanimals.js
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Updated some tower code and documented methods.