logIn.html replaced with login.jsp
Merge branch 'master' of https://github.com/khidesha/onlineSchoolDiary.git