modified:   index.txt
 modifies : index.html
Merge branch 'gh-pages' of https://github.com/carnotweat/Notes into gh-pages

* 'gh-pages' of https://github.com/carnotweat/Notes:
  Update index.txt
  delete index.html
  delete index.html

Conflicts:
	index.html
	index.txt
hi