First commit
Merge branch 'master' of github.com:guillaumewuip/semantic-grid

Conflicts:
	README.md
Temp README