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/f2/history.index

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

Beep/bin/classes/com/beep_boop/Beep/startScreen/StartLevelActivity.class