Merge branch 'master' of https://github.com/differui/elastic-grid.css
Merge branch 'master' of https://github.com/differui/elastic-grid.css

Conflicts:
	README.md