yikes
Merge branch 'master' of https://github.com/RanSolo/straight_up_sound

Conflicts:
	.gitignore