Update README.md
Merge branch 'gh-pages'
Created CNAME
Update README.md
Deleted CNAME
Merge branch 'gh-pages'
Merge branch 'gh-pages'

Conflicts:
	README.md
Coolio!
Merge branch 'master' of https://github.com/ColeTownsend/Balzac-for-Jekyll

Conflicts:
	README.md
readme update
Update README.md
Merge branch 'gh-pages'

Conflicts:
	_site/README.md
	_site/feed.xml
Update README.md
Merge branch 'gh-pages'
Update README.md
Update README.md
Merge branch 'gh-pages'
Merge branch 'dev'
Merge branch 'dev'
Update page.html

Yikes