#4: layout for next row type including changes at randomly chosen breakpoint
Merge branch 'master' of https://github.com/lifewithoutandy/warhol

Conflicts:
	static/scss/grid.scss
	static/style.css
	static/templates/index.html