Merge branch 'braa'
added file
ct
changed
changed master
changed master merged
added excel
changed excel
changed excel master
Merge branch 'excl'

Conflicts:
	Auf.xls
Merge branch 'master' of https://github.com/Andorxor/try_git