Another final gui update
Merge branch 'master' of https://github.com/tylerphelan/project4
merge again