darren cattle about to go live on heroku 48 wide
dude stop
austin rocks and fixes stuff like client side build errors
Merge branch 'master' of heroku.com:darren-grid

Conflicts:
	dist/index.html
	dist/scripts/7b8825b8.scripts.js
	web.js
Merge branch 'master' of heroku.com:darren-grid
compiles heroku