2014-1102: test
Merge branch 'master' of https://github.com/yklan/yklan.github.io

Conflicts:
	index.html