Created first wave simulation and combat system
Fixed merge conflicts