Site updated at 2014-04-23 00:28:37 UTC
Merge branch 'master' of https://github.com/terakrk/terakrk.github.io

Conflicts:
	CNAME
Site updated at 2014-04-23 00:38:01 UTC