Amended jar merge
Merge branch 'jar' of https://github.com/GolfTeam/golf into jar

Conflicts:
	src/gui/ChallengesSection.java