new blog
Merge branch 'master' of https://github.com/Dharma-n/Dharma-n.github.io

Conflicts:
	feed.xml
new blog