*** work on gui
Merge branch 'master' of git://github.com/lschiffer/BasicGame