test
Merge branch 'dev' of github.com:nyl-auster/havre into dev

Conflicts:
	sites/lab.txt