remote 2
Merge branch 'master' of github.com:ducarroz/sample

Conflicts:
	index.html