awesome change
Merge branch 'master' of https://github.com/stephenlloyd/octocat
changed readme
fixed conflicts