changes
merged changes
Added shape modification methods
Merged Conflicts
Merge branch 'master' of https://github.com/alexredna/game_engine_scala