index
Merge branch 'master' of https://github.com/sukwanlee/thoughtdots

Conflicts:
	templates/index.html