From Mirage
Mirage 2
Merge branch 'master' of https://github.com/hsenid-mobile/git-workshop
Merge pull request #31 from Mirage20/master

My Pull request 1