Got the most updated version
Updated ALOT OF FILES
Making more changes
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	ycp-cs320-project-ui/.classpath
	ycp-cs320-project-ui/.settings/com.google.gdt.eclipse.core.prefs