slight mods to return classes, linked return button in gui
Merge branch 'master' of https://github.com/danvas/cs304-part3.git