style
style2
Merge branch 'master' of https://github.com/tiagomarques/bitstarter

Conflicts:
	index.html