intial configuration
changed basic config
Merge branch 'heroku/master'

Conflicts:
	_config.yml
	public/atom.xml
generated site