Login & Register (Untested)
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/models/User.java