Merge
Finished Add User functionality
Merge branch

Conflicts:
	src/Model/QueryBuild/Execute.java
	src/Model/ViewModel.java