combined all 22:26 6/5
Merge branch 'master' of https://github.com/millieckm/battlecity