added basic wave functionality and created base enemy class
fix merge conflicts