Merge pull request #1 from rmasoni/master

New layout
Update README.md
Update README.md
Fix colors
Update README
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md