ui pretty much done
Merge branch 'master' of https://github.com/michaelorschel/TechwebGame