mikeizbicki/ucr-cs100 — pull request #506 by ChemicalWonders (2014-12-03 21:11:43+00:00)
Title: merging mike's branch into mine

i think i'm not sure what i'm doing.