GUI WORKS
Merge branch 'gamedesign' of https://github.com/Tadimsky/vooga into gamedesign
Merge conflict resolved
Merge branch 'gamedesign' of https://github.com/Tadimsky/vooga into gamedesign
Merge branch 'gamedesign' of https://github.com/Tadimsky/vooga into gamedesign