Tried to implement strength calibration/tcellcount

Should change strength once t cell count hits certain level but it is
not working.
Minor fixes to keep method naming conventions consistent
synchronization
synchronizing with master

Eclipse didn't 'refresh' properly so the merge is registering as a
commit
stupid things
Merge remote-tracking branch 'origin/master' into Steph
Merge remote-tracking branch 'origin/master' into Steph
Merge remote-tracking branch 'origin/master' into Steph
Merge remote-tracking branch 'origin/master' into Steph
Merge remote-tracking branch 'origin/master' into Steph
Synchronize with master

Weird spacing differences
idk
idk
Merge branch 'Steph' of https://github.com/janetzhu/ap-project4 into Steph

Conflicts:
	AP Project 4/src/impl/InvasionGame.java

Fixed merge conflict
fixing merge conflicts
fixing merge conflicts
fixing merge conflicts
Merge remote-tracking branch 'origin/Steph'
Merge branch 'master' of https://github.com/janetzhu/ap-project4