Login stuff
New Login
New
Merge branch 'master' of https://github.com/JIzAchO/Not-FaceBook.git

Conflicts:
	WebContent/resources/views/Facebook.xhtml
	WebContent/resources/views/LogInPage.xhtml