GUI somehow works
Merge pull request #20 from zpp-2014-15/gui_update

GUI somehow works
Merge branch 'master' into adding_chunk_update
Some style fixes