Add CNAME file
Merge remote-tracking branch 'rubyonrio/master'

Conflicts:
	CNAME