Implements extra credit requirements#1

Open

RobFreiburger wants to merge 8 commits intosacruby:masterfrom

RobFreiburger:master

Commits on Apr 19, 2013

Fixes missing end to if conditional.
RobFreiburger
committed

Commits on May 8, 2013