commit on deploy branch before merge with master branch
Merge branch 'master' into deploy

Conflicts:
	.gitignore
	_site/feed.xml
Updated 2014-11-03-design-thinking-innovator.md
added cname
Merge remote-tracking branch 'origin/deploy' into deploy
committing pulled post
committing pulled post
committing pulled post
committing pulled post
committing pulled post
Merge branch 'deploy' into gh-pages

Conflicts:
	_site/feed.xml
cname changed
removed feed file