Viewmodel class

Added view model class
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Controller/WelcomeController.java
Merger