mikeizbicki/ucr-cs100 — pull request #206 by BridgetBennecke (2014-10-13 19:14:54+00:00)
Title: Corrected "bugfix" to "master" under merge conflict section

The merge that caused the conflict was requested from master branch to userinput branch, not from the bugfix branch.