manual merge
Merge branch 'master' of github.com:11samype/Swap1-Team3

Conflicts:
	sg15/src/scheduleGenerator/Config.java