commit before pull request
commit after pull
Merge branch 'master' into test-pull-request
commit after the master merge
Merge pull request #3 from sutoa/test-pull-request

commit before pull request