so I can pull
Merge branch 'master' of https://github.com/Fishythefish/AudioParse

Conflicts:
	res/layout/main.xml