Model work
Merge branch 'master' of https://github.com/Lucus16/stuff

Conflicts:
	src/stuff/Main.java