Commiting 2a and 2b
Merge branch 'master' of https://github.com/peymanmortazavi/hackathon-github
Merge branch 'master' of https://github.com/peymanmortazavi/hackathon-github