bugfix
Merge branch 'master' of github.com:FruitOfLight/vida

Conflicts:
	src/Model.java