add Merge2
Merge branch '2.0' of https://github.com/andredangelo/Responsive-Framework into 2.0

Conflicts:
	merge.html
merged
teste