Eric's changes
"Merging from last commit"

Merge remote-tracking branch 'refs/remotes/origin/master'
"Pulled from Ruby's"

Merge branch 'master' of https://github.com/CMPUT301F14T03/lotsofcodingkitty
Eric's test suite