Wrote code that needs to be tested on the phone for the Spectrum screen
Merge remote-tracking branch 'origin/master'

Conflicts:
	MobileAudioWorkstation/src/com/mobilemusic/mobileaudioworkstation/MainActivity.java
	MobileAudioWorkstation/src/com/mobilemusic/mobileaudioworkstation/audio/AudioSystem.java
	MobileAudioWorkstation/src/com/mobilemusic/mobileaudioworkstation/audio/AudioThread.java
Wrote code that needs to be tested on the phone for the Spectrum screen
Wrote code that needs to be tested on the phone for the Spectrum screen