working?
Merge branch 'master' of https://github.com/GokuITA/chatlog

Conflicts:
	templates/index.html