New rep
Merge branch 'master' of https://github.com/marek007/myapp

Conflicts:
	web.js
Updated web.js
new file
Change of name
Merge branch 'master' of https://github.com/marek007/bitstarter