update
Merge branch 'master' of github.com:muxuezi/muxuezi.github.io

Conflicts:
	categories/7w7l.xml
	categories/chs.xml
	categories/da.xml
	categories/htmlcss.xml
	categories/ipython.xml
	categories/javascript.xml
	categories/julia.xml
	categories/linux.xml
	categories/lottery.xml
	categories/prolog.xml
	categories/python.xml
	categories/ruby.xml
	categories/sth.xml
	categories/swift.xml
	categories/windows.xml
	rss.xml
	sitemap.xml
	sitemapindex.xml