i'm committing
Merge branch 'master' of http://github.com/Jbtyson/cis580-rts into ai

Conflicts:
	rts/src/rts.js
fuck git