No more cursor
Merge branch 'master' of https://github.com/alexsapps/cse125
Team indicators
Merge branch 'master' of https://github.com/alexsapps/cse125

Conflicts:
	Breakneck Brigade/res/resources.xml