Minor Changes
Merge branch 'master' of https://github.com/Dig-Doug/EC327-Project

Conflicts:

.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.cor
e.resources
	.metadata/.plugins/org.eclipse.jdt.core/2990356587.index