added a new line
asd
Merge branch 'feature'
added dir
Merge branch 'master' of https://github.com/mheinrich94/try_git