Gitignore
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
Edit menu should work now, not actually tested... Uses button num list, and doesn't check for invalid entries.
Edit menu should work now, not actually tested... Uses button num list, and doesn't check for invalid entries.
Merge branch 'AudioTrack' of github.com:wimbot32259/M3-BeatMatrix into AudioTrack
New edit button (check out that sexy photoshop work).
Changed the edit menu to display a numerical value when adjusting the volume, temp, etc.
new gitignore

Conflicts:
	.gitignore
preloading song list reimplented. now we need to splash screen while app loads
merging
Merge branch 'dev' of https://github.com/wimbot32259/M3-BeatMatrix into dev

Conflicts:
	BeatMatrix/bin/classes.dex
	BeatMatrix/bin/resources.ap_
	BeatMatrix/src/com/joshuac/beatmatrix/ButtonMatrix.java
Merge branch 'AudioTrack' into dev
fixed git ignore
fixing merge