Octopress init
Site updated at 2014-09-08 15:33:04 UTC
Site updated at 2014-09-08 15:34:19 UTC
Merge branch 'master' of github.com:nicnocquee/nicnocquee.github.com

Conflicts:
	about/index.html
	archives/index.html
	atom.xml
	blog/2012/07/22/intro/index.html
	blog/2012/07/22/the-problem-with-pingdom/index.html
	blog/2012/09/17/going-forward/index.html
	blog/2012/09/17/thoughts-blogging-is-hard/index.html
	blog/2012/09/18/photos-weekly-kansai-number-1/index.html
	blog/2012/09/18/share-interesting-findings-number-1/index.html
	blog/2012/09/19/news-kaomoji-for-mac-1-dot-5-is-out/index.html
	blog/2012/09/19/share-interesting-findings-number-2/index.html
	blog/2012/09/19/thoughts-so-the-term-is-the-apple-reaper/index.html
	blog/2012/09/20/share-ios-6-maps-it-just-works-not/index.html
	blog/2012/09/20/thoughts-speaking-of-smartphones-revolution/index.html
	blog/2012/09/21/share-speaking-of-kaomoji/index.html
	blog/2012/09/21/thoughts-dick-move-from-twitter/index.html
	blog/2012/09/22/hobby-linkin-park-nendoroidized/index.html
	blog/2012/09/23/review-mac-photo-bundle/index.html
	blog/2012/09/23/share-zoomable-xkcd-click-and-drag-map/index.html
	blog/2012/09/25/photos-weekly-kansai-number-2/index.html
	blog/2012/09/26/japanese-todays-nihonggo-number-1/index.html
	blog/2012/09/27/thoughts-opened-facebook-and-twitter-after-a-week/index.html
	blog/2012/09/28/share-happy-birthday-to-nih/index.html
	blog/2012/09/28/share-what-if-from-the-creator-of-xkcd/index.html
	blog/2012/10/02/photos-weekly-kansai-number-3/index.html
	blog/2012/10/03/share-steve-jobs-at-international-design-conference/index.html
	blog/2012/10/04/japanese-todays-nihonggo-number-2/index.html
	blog/2012/10/04/review-transfer-photos-from-memory-card-to-and-from-iphone-using-airstash/index.html
	blog/2012/10/07/share-delicious-design-number-1/index.html
	blog/2012/10/07/travel-india-mela-2012-kobe-japan/index.html
	blog/2012/10/09/photos-weekly-kansai-number-4/index.html
	blog/2012/10/12/ios-ipad-bug/index.html
	blog/2012/10/12/ipad-upgraded-to-ios-6-for-the-magazine/index.html
	blog/2012/10/12/share-ironies-of-the-day/index.html
	blog/2012/10/14/share-tos-lie/index.html
	blog/2012/10/14/video-two-short-clips-from-our-short-trips/index.html
	blog/2012/10/15/news-monoco-iphone-app-is-now-available-on-the-japan-app-store/index.html
	blog/2012/10/15/share-quote-of-the-day-number-1/index.html
	blog/2012/10/16/photos-weekly-kansai-number-5/index.html
	blog/2012/10/23/photos-weekly-kansai-number-6/index.html
	blog/2012/10/23/share-dont-buy-a-kindle/index.html
	blog/2012/10/23/thoughts-no-reason-for-samsung-to-stop-copying-apple/index.html
	blog/2012/10/24/news-monoco-for-iphone-update-is-available-now/index.html
	blog/2012/10/24/thoughts-imac-was-the-queen-of-the-apple-event/index.html
	blog/2012/10/25/video-one-person-depapepe-on-the-street-of-sannomiya/index.html
	blog/2012/10/27/share-fake-monk-scam/index.html
	blog/2012/10/27/share-interesting-findings-number-3/index.html
	blog/2012/10/29/thoughts-i-hope-apple-will-never-do-this/index.html
	blog/2012/10/29/thoughts-lover-hater-its-all-about-apple/index.html
	blog/2012/10/30/photos-weekly-kansai-number-7/index.html
	blog/2012/10/30/share-the-best-explanation-of-apples-reshuffle/index.html
	blog/2012/10/30/thoughts-hoax-photo-of-the-frankenstorm/index.html
	blog/2012/11/02/share-interesting-findings-number-4/index.html
	blog/2012/11/02/thoughts-ipad-mini-first-impression/index.html
	blog/2012/11/05/news-kotatsu-after-4-years-in-japan/index.html
	blog/2012/11/05/thoughts-ipad-mini-after-3-days/index.html
	blog/2012/11/06/photos-weekly-kansai-number-8/index.html
	blog/2012/11/13/photos-weekly-kansai-number-9/index.html
	blog/2012/11/19/ios-split-screen-in-xcode-4/index.html
	blog/2012/11/20/photos-weekly-kansai-number-10/index.html
	blog/2012/11/27/photos-weekly-kansai-number-11/index.html
	blog/2012/12/03/share-humans-can-never-be-satisfied/index.html
	blog/2012/12/03/thoughts-the-end-of-glossy-design-era/index.html
	blog/2012/12/04/photos-weekly-kansai-number-12/index.html
	blog/2012/12/04/thoughts-how-facebook-ers-react-to-a-call-to-action/index.html
	blog/2012/12/11/photos-weekly-kansai-number-13/index.html
	blog/2012/12/17/thoughts-the-ugliest-view-in-ios-6/index.html
	blog/2012/12/18/photos-weekly-kansai-number-14/index.html
	blog/2012/12/25/photos-weekly-kansai-number-15/index.html
	blog/2012/12/26/thoughts-be-an-ios-developer-now/index.html
	blog/2013/01/01/photos-weekly-kansai-number-16/index.html
	blog/2013/01/05/thoughts-january-4-was-my-real-new-year/index.html
	blog/2013/01/07/share-jobs-was-a-romantic/index.html
	blog/2013/01/08/photos-weekly-kansai-number-17/index.html
	blog/2013/01/08/thoughts-i-hate-money/index.html
	blog/2013/01/09/thought-the-world-could-have-gotten-ibicycle/index.html
	blog/2013/01/10/thoughts-rdf-its-in-the-juice/index.html
	blog/2013/01/11/ios-things-i-bet-you-dont-know-about-promoting-your-app/index.html
	blog/2013/01/15/photos-weekly-kansai-number-18/index.html
	blog/2013/01/22/photos-weekly-kansai-number-19/index.html
	blog/2013/01/22/thoughts-28/index.html
	blog/2013/01/29/photos-weekly-kansai-number-20/index.html
	blog/2013/04/06/osx-fun-with-terminal/index.html
	blog/2013/05/10/ios-open-source-projects-used-in-facebook-ios/index.html
	blog/2013/10/16/how-to-enter-unicode-characters-in-mac/index.html
	blog/2014/01/03/thats-so-two-years-ago/index.html
	blog/2014/01/19/your-verse/index.html
	blog/2014/03/13/run-ios-app-in-different-languages-quickly-in-ios-simulator/index.html
	blog/2014/04/02/install-any-fonts-and-use-it-in-any-apps-in-ios-7/index.html
	blog/2014/06/26/script-to-download-wwdc-2014-videos/index.html
	blog/2014/07/22/app-my-story/index.html
	blog/archives/index.html
	blog/categories/apple/atom.xml
	blog/categories/apple/index.html
	blog/categories/audio/atom.xml
	blog/categories/audio/index.html
	blog/categories/camera/atom.xml
	blog/categories/camera/index.html
	blog/categories/comic/atom.xml
	blog/categories/comic/index.html
	blog/categories/design/atom.xml
	blog/categories/design/index.html
	blog/categories/dev/atom.xml
	blog/categories/dev/index.html
	blog/categories/figure/atom.xml
	blog/categories/figure/index.html
	blog/categories/hack/atom.xml
	blog/categories/hack/index.html
	blog/categories/hobby/atom.xml
	blog/categories/hobby/index.html
	blog/categories/internet/atom.xml
	blog/categories/internet/index.html
	blog/categories/ios/atom.xml
	blog/categories/ios/index.html
	blog/categories/ipad/atom.xml
	blog/categories/ipad/index.html
	blog/categories/iphone/atom.xml
	blog/categories/iphone/index.html
	blog/categories/japan/atom.xml
	blog/categories/japan/index.html
	blog/categories/japanese/atom.xml
	blog/categories/japanese/index.html
	blog/categories/kansai/atom.xml
	blog/categories/kansai/index.html
	blog/categories/kaomoji/atom.xml
	blog/categories/kaomoji/index.html
	blog/categories/kindle/atom.xml
	blog/categories/kindle/index.html
	blog/categories/learn/atom.xml
	blog/categories/learn/index.html
	blog/categories/mac/atom.xml
	blog/categories/mac/index.html
	blog/categories/monoco/atom.xml
	blog/categories/monoco/index.html
	blog/categories/music/atom.xml
	blog/categories/music/index.html
	blog/categories/news/atom.xml
	blog/categories/news/index.html
	blog/categories/nihonggo/atom.xml
	blog/categories/nihonggo/index.html
	blog/categories/osx/atom.xml
	blog/categories/osx/index.html
	blog/categories/photos/atom.xml
	blog/categories/photos/index.html
	blog/categories/pixel/atom.xml
	blog/categories/pixel/index.html
	blog/categories/quote/atom.xml
	blog/categories/quote/index.html
	blog/categories/review/atom.xml
	blog/categories/review/index.html
	blog/categories/scribeit/atom.xml
	blog/categories/scribeit/index.html
	blog/categories/self/atom.xml
	blog/categories/self/index.html
	blog/categories/share/atom.xml
	blog/categories/share/index.html
	blog/categories/sherlock/atom.xml
	blog/categories/sherlock/index.html
	blog/categories/thought/atom.xml
	blog/categories/thought/index.html
	blog/categories/thoughts/atom.xml
	blog/categories/thoughts/index.html
	blog/categories/travel/atom.xml
	blog/categories/travel/index.html
	blog/categories/twitter/atom.xml
	blog/categories/twitter/index.html
	blog/categories/uptime/atom.xml
	blog/categories/uptime/index.html
	blog/categories/video/atom.xml
	blog/categories/video/index.html
	blog/categories/wwdc/atom.xml
	blog/categories/wwdc/index.html
	blog/index.html
	favicon.png
	index.html
	javascripts/github.js
	javascripts/modernizr-2.0.js
	javascripts/octopress.js
	javascripts/pinboard.js
	javascripts/twitter.js
	sitemap.xml
	stylesheets/screen.css