Finished the classes model

Merge origin/master

Conflicts:
	src/controller/Controller.java
	src/main/MainClass.java