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

Conflicts:
	fb_login.js
	index.html