Merge branch 'master' of
https://github.com/Kelseyfargas/CSCI201FinalProject.git

Conflicts:
	.classpath
	.settings/org.eclipse.jdt.core.prefs
Merge branch 'master' of
https://github.com/Kelseyfargas/CSCI201FinalProject.git

Conflicts:
	.classpath
	.settings/org.eclipse.jdt.core.prefs