format jsp
Merge branch 'master' of https://github.com/jessehwong/Attendance.git

Conflicts:
	src/main/java/dbconn.properties

Rname login.jsp to login.html