added user
Merge remote-tracking branch 'origin/master'

Conflicts:
	Information Asset Registry/src/controller/LoginController.java
Fixed user