Grid system added
Merge branch 'master' of https://github.com/Lorti/2014

Conflicts:
	css/main.css
	index.markdown
Index conflicts resolved