added txt datei
Merge branch 'test'

Conflicts:
	.DS_Store