Add new file other.txt
Merge branch 'master' of github.com:dasonntag/demo