combining some stuff from other branches
Merge branch 'enemies' of https://github.com/leaflet757/cs20 into enemies