modify favicon path
Merge remote-tracking branch 'origin'

Conflicts:
	_site/2013-06-01-githubpages/index.html
	_site/2013-06-15-lastfm/index.html
	_site/2013-06-16-lastfm/index.html
	_site/2013-07-24-coffeescript/index.html
	_site/2013-07-30-createjs/index.html
	_site/2013-12-21-rap/index.html
	_site/2013-12-22-garagepunk/index.html
	_site/2013-12-23-lose_to_buy/index.html
	_site/2014-01-25-swipe/index.html
	_site/2014-01-29-scrollfade/index.html
	_site/2014-01-30-sakuravps/index.html
	_site/2014-02-12-canvas/index.html
	_site/2014-02-21-viral/index.html
	_site/2014-02-27-wp/index.html
	_site/2014-03-29-ios/index.html
	_site/2014-03-30-ios/index.html
	_site/2014-04-12-github/index.html
	_site/2014-04-13-resolution/index.html
	_site/2014-04-14-xcodecolor/index.html
	_site/2014-04-15-storyboard/index.html
	_site/2014-04-18-dispatch_after/index.html
	_site/2014-04-19-singleton/index.html
	_site/2014-04-20-cocoapods/index.html
	_site/2014-04-22-json/index.html
	_site/2014-05-13-file_api/index.html
	_site/2014-08-02-angularjs_suggest/index.html
	_site/2014-08-03-ios/index.html
	_site/2014-08-04-ios/index.html
	_site/rss.xml
	_site/tags.html