notes
Merge branch 'master' of github.com:Quantisan/nullwave

Conflicts:
	script.rb