Final touches to gui
Merge branch 'master' of https://github.com/ThunderHawks/The-Hook
Final touches to gui