Committing before pulling
Merge branch 'master' of https://github.com/Sketarius/LSC

Conflicts:
	bin/edu/ipfw/lsc/week/WeeklyResult.class