Changed SHA1 to reflect correct spelling and pronunciation
Changed text explaining reset --hard to explicitly state which part of the command needed to be replaced
fixed merge conflicts with sha-tag branch
Fixed merge conflicts with shah
removed .orig file
Merge pull request #5 from miketoth/master

Fixed merge conflicts