Added 4 passing tests
resolved merge conflict. minor refactoring issue in controller
Merge pull request #18 from golden-bears-2014/Germain_Janet

Added 4 passing tests