Added some new levels, fixed bug in level editor
Solved conflict
Rebuilt editor