TEMP! Working on making GUI for setting edit details of songs.
Merge branch 'AudioTrack' of github.com:wimbot32259/M3-BeatMatrix into AudioTrack

Conflicts:
	BeatMatrix/bin/classes.dex