Initial GUI workding
Merge branch 'master' of github.com:bcasias/SoftwareFinal