commiting unfinished changes to pull
Merge branch 'master' of http://www.github.com/gundermanc/eecs290-unity3d-tank
Tanks chase you when hit
hopefully fixed merge conflicts?
hopefully fixed merge conflicts, for real