Finished Login. Working on Register.
I hate java so much.
Merge origin/master

Conflicts:
	project.db
	src/java/model/db/DBAccess.java
	web/dashboard.jsp
Revert "Merge origin/master"

This reverts commit 9a72176f691947e7075fb811527fce2f27ce151e.