jules
Merge branch 'master' of github.com:pfarrell/obst

Conflicts:
	stratagems.flat