Merge remote-tracking branch 'origin/master'

Conflicts:
	research/index.html
Merge branch 'master' of https://github.com/shanjit/shanjit.github.com