Fine Jon I'll use org mode jeez
Merge branch 'RC1/master' of https://github.com/benbreedlove/smokejs into RC1/master

Conflicts:
	todo.org