hot
Merge branch 'hot' of https://github.com/greggraf/flow2

Conflicts:
	notes.txt