progress
Merge branch 'master' of github.com:piepkrak/sfuncube-hackathon

Conflicts:
	web/index.html