trying to fix
fuuu!
Merge branch 'master' of https://github.com/alyssialui/CodeSprint

Conflicts:
	CodeSprint/.metadata/.log
	CodeSprint/.metadata/.plugins/org.eclipse.cdt.core/.log
	CodeSprint/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	CodeSprint/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	CodeSprint/.metadata/.plugins/org.eclipse.jdt.core/797091720.index
	CodeSprint/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	CodeSprint/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml