Made Home Servlet
Merge branch 'master' of https://github.com/elongpre/The-Seventh-Group

Conflicts:
	RoomLife/war/WEB-INF/web.xml