Merging civilians
Merge branch 'master' of https://github.com/Alycen/GameDeviceProject1
peace up a-town down