commit demi ngepull
Merge branch 'master' of https://github.com/sharonrh/SIOUI

Conflicts:
	src/java/controller/LoginController.java
	src/java/model/Model.java