test
Merge branch 'wipeout-2' into new-template-engine

Conflicts:
	todo.txt
observe paths