gitignore added
login jsp updated
login jsp reverted
Merge branch 'master' into view

Conflicts:
	TutorialFinder/src/main/webapp/login.jsp