music
Merge branch 'master' of https://github.com/Dig-Doug/EC327-Project

Conflicts:
	.metadata/.log

.metadata/.plugins/org.eclipse.core.resources/.projects/Beep/.indexes/e4
/81/5f/4e/92/history.index

.metadata/.plugins/org.eclipse.core.resources/.projects/Beep/.indexes/e4
/81/5f/4e/a0/history.index

.metadata/.plugins/org.eclipse.core.resources/.projects/Beep/.indexes/e4
/81/5f/4e/dc/history.index

.metadata/.plugins/org.eclipse.core.resources/.projects/Beep/.indexes/e4
/81/5f/4e/f2/history.index

.metadata/.plugins/org.eclipse.core.resources/.projects/Beep/.indexes/pr
operties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Beep/.markers

.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/2990356587.index
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml

Beep/bin/classes/com/beep_boop/Beep/startScreen/StartLevelActivity.class
	Beep/src/com/beep_boop/Beep/levelSelect/MapActivity.java
music
Merge branch 'master' of https://github.com/Dig-Doug/EC327-Project

Conflicts:

.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.cor
e.resources
	.metadata/.plugins/org.eclipse.jdt.core/2990356587.index