important stuff
Merge branch 'gh-pages' of github.com:friesencr/teamfriesen_com into gh-pages

Conflicts:
	_config.yml
	_posts/2013-07-16-welcome-to-jekyll.markdown