zmiany
Merge branch 'master' of https://github.com/kjakimiec/bitstarter

Conflicts:
	web.js
bitstarter index.htm added