Revert "added bensbranch changes by hand"

This reverts commit 582ece9cdba9622943e1cf746167845e2efe59b7.
Merge branch 'master' of https://github.com/CMPUT301F14T08/StackUnderflow