Working on UI
Merge branch 'master' of github.com:Asyncronous/theCube