blogging first steps
Merge remote-tracking branch 'origin/master'

Conflicts:
	Rakefile
	_config.yml
blogging first steps