Veeettiiiffaaannn!!!
Merge branch 'master' of https://github.com/hxmn/imat

Conflicts:
	imat/imat/src/imat/IMatController.java