Initial enemy dev
Fixed merge issues.

#yolo