this is a test for the configuration of MJ's Netbeans IDE to the Git Repository
Merge origin/master
added
added
added
added
Merge origin/master

Conflicts:
	src/model/bean/UserBean.java
	src/presenter/LoginPresenter.java
	src/view/ui/LoginScreenView.java