branch Friedrich
add another file
test
Merge branch 'FriedrichsMasterBranch'
Merge branch 'master' of https://github.com/ni-wei/gitTutorial