a lot of changes
Merge branch 'master' of https://github.com/Zerith90/IS480

Conflicts:
	src/main/webapp/static/tutorial-home.jsp