my first commit
change two files
Merge branch 'master' of https://github.com/unlessbamboo/my_first