Home page files
Home page files
Merge branch 'Yu' of https://github.com/tommyschnabel/SoftwareSystemsEngineeringProject into Yu

Conflicts:
	src/main/webapp/index.html
Merge pull request #21 from tommyschnabel/Yu

Home page files