ok
Merge remote-tracking branch 'origin/master'
Filling

Changes 7/17
GUI stuff added
GUI .display changed
Merge remote-tracking branch 'origin/Heath'
Merged Matts branch in