test
Merge branch 'master' of github.com:flareinc/flareinc.github.io

Conflicts:
	_posts/2013-09-18-test.md
	stylesheets/style.css