finished day display
Merge branch 'days'

Conflicts:
	.gitignore