hehe
Merge branch 'master' of https://github.com/gumho/sampl

Conflicts:
	test