Corrected "bugfix" to "master" under merge conflict section of README
Merge pull request #206 from BridgetBennecke/cs100-2014fall

Corrected "bugfix" to "master" under merge conflict section