init
Merge branch 'master' of github.com:avidys/bitstarter

Conflicts:
	controller.js
	index.html
	web.js