Init server
Merge branch 'master' of github.com:bapmrl/dig

Conflicts:
	project/www/index.html