Added conflict.
Added conflict.
Merge branch 'master' of https://github.com/fawrkes/cs51_final

Conflicts:

workspace/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.e
clipse.core.resources
	workspace/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi

workspace/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers
.dat
asdf