Automated commit at 2014-08-11 22:40:33 UTC by middleman-deploy 0.2.4
Merge branch 'master' of github.com:trigcom/trigcom.github.io

Conflicts:
	index.html
	javascripts/all.js
	stylesheets/application.css