Columns
Basic layout
Merge branch 'columns' into intro

Conflicts:
	css/styles.css
	index.html
Merge branch 'intro'