asdf
Merge branch 'master' of https://github.com/charlesfarmer/hypermedia.git

Conflicts:
	web lab 5 - front-end/WebContent/WEB-INF/index.jsp