added enemies
Merge branch 'master' of https://github.com/ggamb002/cs134_Current

Conflicts:
	Current/HelloPolycodeApp.cpp
	Current/generator.H

Signed-off-by: Isaac <igome002@ucr.edu>