generated 1st wave in level 1, changed some enemy behavior, made rock lighter
Merge remote-tracking branch 'origin/master'

Conflicts:
	enemy.py