First full commit
Merge branch 'master' of https://github.com/ixregardo/testbed

Conflicts:
	index.html