Made some modifications
Merge branch 'master' of git@github.com:jheltze3/ycp-cs320-project.git

Conflicts:
	ycp-cs320-project/.gwt/.gwt-log