Welcome page is now login page
Merge branch 'master' of https://github.com/arjunswaj/facebook.git

Conflicts:
	project/WebContent/WEB-INF/web.xml