doh
Merge branch 'master' of github.com:DavePearce/WhileyWeb

Conflicts:
	src/main.py