My first commit from git workshop
Merge branch 'master' of https://github.com/hsenid-mobile/git-workshop
2nd
fixed and merged conflicts of cassendra's pull request