Merge branch 'chats'
finished day display
Merge branch 'days'

Conflicts:
	.gitignore
Merge branch 'master' into chats