updates files in repository
Merge branch 'master' of https://github.com/bkearns240/CS315

Conflicts:
	.metadata/.plugins/org.eclipse.cdt.core/.log

.metadata/.plugins/org.eclipse.core.resources/.projects/GLDancingRobotAc
tivity/.markers

.metadata/.plugins/org.eclipse.core.resources/.projects/GLDancingRobotAc
tivity/org.eclipse.jdt.core/state.dat

.metadata/.plugins/org.eclipse.core.resources/.projects/Shading/.markers

.metadata/.plugins/org.eclipse.core.resources/.projects/Shading/org.ecli
pse.jdt.core/state.dat

.metadata/.plugins/org.eclipse.core.resources/.projects/cs315_hwk1/.mark
ers

.metadata/.plugins/org.eclipse.core.resources/.projects/cs315_hwk1/org.e
clipse.jdt.core/state.dat

.metadata/.plugins/org.eclipse.core.resources/.projects/cs315_hwk2/.mark
ers

.metadata/.plugins/org.eclipse.core.resources/.projects/cs315_hwk2/org.e
clipse.jdt.core/state.dat

.metadata/.plugins/org.eclipse.core.resources/.projects/cs315_hwk3/.mark
ers

.metadata/.plugins/org.eclipse.core.resources/.projects/cs315_hwk3/org.e
clipse.jdt.core/state.dat

.metadata/.plugins/org.eclipse.core.resources/.projects/cs315_hwk5/.inde
xes/e4/27/c2/79/history.index

.metadata/.plugins/org.eclipse.core.resources/.projects/cs315_hwk5/.mark
ers

.metadata/.plugins/org.eclipse.core.resources/.projects/cs315_hwk5/org.e
clipse.jdt.core/state.dat

.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.cor
e.resources
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/422144404.index
	.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache

.metadata/.plugins/org.eclipse.ui.workbench.texteditor/dialog_settings.x
ml