rebel! merge this baby! :)

editing the level and playing the game merged into one