new
Merge branch 'master' of https://github.com/noboo/starkers-bootstrap-grid

Conflicts:
	grid-starkers-master/css/component.css
	grid-starkers-master/index.php