repository merge conflict repaired
add faker to gemfile
Merge pull request #11 from alexung/alex_github_api

Alex github api