finish special level for specific shape combination
resolve conflicts
Merge branch 'master' of https://github.com/amitburst/GravityShift
add special shape goal info to json file