update
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/nclodger/control/action/SignUpAction.java
Merge branch 'master' of C:\Users\Miredean\Documents\GitHub\NCLodger with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	dblibs/init.sql
	src/main/java/com/nclodger/control/action/SignInAction.java
	src/main/java/com/nclodger/dao/UserDao.java
	src/main/java/com/nclodger/dao/UserDaoInterface.java
Merge remote-tracking branch 'origin/master'
Edited: Java Convention
Merge remote-tracking branch 'origin/master'