merging both
Merge branch 'master' of https://github.com/stefc85/b2c

Conflicts:
	index.html