tali's edit
Merge origin/master

Conflicts:
	src/team_juliett_processor/Course.java
Merge origin/master

Conflicts:
	src/team_juliett_processor/Course.java
Merge origin/master