Pretty much didn't change anything
Merge remote-tracking branch 'origin/master'

Conflicts:
	karel/package.bluej
Revert "Pretty much didn't change anything"

This reverts commit 198d956d604c0b2df4c3008aea84b56b5491f787.