My second commit
Merge branch 'master' of https://github.com/Bitart/boilerplate

Conflicts:
	index.html
now changing index
index mudanca