updated html
Merge branch 'master' of https://github.com/luisrios/bitstarter

Conflicts:
	index.html
Merge branch 'Staging'

Conflicts:
	index.html
Merge branch 'master' of https://github.com/luisrios/bitstarter

Conflicts:
	index.html