Update
Merge branch 'master' of https://github.com/Severed-Infinity/Semester4Project

Conflicts:
	Semester4Project/.idea/workspace.xml