add m.txt at fixes branch
Merge branch 'fixes'
Merge branch 'master' of github.com:murphykwu/git_test