Merge branch 'master' of https://github.com/hmah/boo

Conflicts:
	docs/Boo.chm