Merge branch 'master' of https://github.com/ANOKNUSA/anoknusa.github.io

Conflicts:
	index.html
	onetrue/2013/10/01/walking-dead-escapism.html
	onetrue/2013/10/05/remakes_and_ressurections.html
	think/2013/10/01/introduction.html
	think/2013/10/02/a-morning-reminder.html
Merge branch 'master' of https://github.com/ANOKNUSA/anoknusa.github.io

Conflicts:
	index.html