added txt datei
ds
Merge branch 'test'

Conflicts:
	.DS_Store
moved something
Merge commit '237cb7e9e2a6c0aa2e12054c1a56be5e1dcff5db'

Conflicts:
	push/.DS_Store