gna2
Merge branch 'master' of https://github.com/jwdsign/jwd2014

Conflicts:
	css/screen.css
	index.html
	sass/_breakpoint-variables.scss