recomit
Merge branch 'master' of https://github.com/LemonMyth/TeamProject

Conflicts:
	.idea/workspace.xml
	index.html