Dan's attempt to the goal bar
Merge branch 'master' of https://github.com/Dig-Doug/EC327-Project

Conflicts:
	Beep/bin/classes/com/beep_boop/Beep/game/PlayView$2.class
	Beep/bin/classes/com/beep_boop/Beep/game/PlayView$3.class
	Beep/bin/classes/com/beep_boop/Beep/game/PlayView$4.class
	Beep/bin/classes/com/beep_boop/Beep/game/PlayView$5.class
Goal Bar re-commit