..
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/ChipsChallenge/grafficStorage/ChipImageDrawer.java