commit to pages branch?
Attempt to include stylesheet
Updated site by serving jekyll
Local is working
trying to get css compiling
testing presence of css/test.html in production
Trying with manual css
Merge branch 'gh-pages'

Conflicts:
	Gemfile
	_config.yml
	_layouts/default.html
	_site/2014/01/17/welcome-to-jekyll/index.html
	_site/css/main.css
	_site/index.html