Content update
Updated device grid
Merge branch 'master' into design

Conflicts:
	public/scss/main.scss
Merge pull request #9 from BoiseFED/design

Design