stuff
Merge branch 'master' of https://github.com/jykoko/TrominoeTiling.git

Conflicts:
	TrominoeTiling/src/model/TrominoeModel.java