Conflicts:
	Gemfile.lock
	_config.yml
update source/style
update CNAME