test cam commit
commit1
commit test
Merge branch 'master' of https://github.com/fawrkes/cs51_final

Conflicts:
	workspace/.metadata/.log

workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/Compos
erator/.markers.snap

workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/Compos
erator/.syncinfo.snap

workspace/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.s
nap

workspace/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.e
clipse.core.resources
	workspace/.metadata/.plugins/org.eclipse.core.resources/.snap
	workspace/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt

workspace/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers
.dat
	workspace/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	workspace/Composerator/Duration.java
Merge branch 'master' of https://github.com/fawrkes/cs51_final

Conflicts:
	workspace/.metadata/.log

workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/Compos
erator/.markers.snap

workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/Compos
erator/.syncinfo.snap

workspace/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.s
nap

workspace/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.e
clipse.core.resources
	workspace/.metadata/.plugins/org.eclipse.core.resources/.snap
	workspace/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt

workspace/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers
.dat
	workspace/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	workspace/Composerator/Duration.java
asdf