review_model
resolved merge conflicts
Review changes
resolved conflict
Merge pull request #6 from TopherBlair/master

Reviews model and controller