HW3

HW3 for CIS 263
Merge remote-tracking branch 'origin/master'

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.cdt.core/.log
	.metadata/.plugins/org.eclipse.cdt.core/Project2.1411924107883.pdom
	.metadata/.plugins/org.eclipse.cdt.core/language.settings.xml
	.metadata/.plugins/org.eclipse.cdt.ui/global-build.log

	.metadata/.plugins/org.eclipse.core.resources/.projects/HW2/.indexes/e4/history.index

	.metadata/.plugins/org.eclipse.core.resources/.projects/Project2/.indexes/e4/history.index

	.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index

	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources

	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
	.metadata/.plugins/org.eclipse.wst.sse.core/task-tags.properties
	.metadata/version.ini
	HW3/.gitignore