Merge branch 'master' of github.com:muralinarasimhan/muralinarasimhan.github.io into source
Merge
Conflicts:
	atom.xml
	blog/archives/index.html
	favicon.png
	index.html
	javascripts/octopress.js
	sitemap.xml
	stylesheets/screen.css