broken but progressing...
Merge branch 'new' of https://github.com/brain-deaf/note into new

Conflicts:
	samples/donk.ogg