new try
Merge branch 'master' of https://github.com/thisjody/test_cf

Conflicts:
.index.html.swp
Merge branch 'master' of https://github.com/thisjody/test_cf

Conflicts:
	.index.html.swp
	_index.html