Refactoring to reduce complexity
Merge branch 'master' of http://github.com/jimcavoli/College-Reaper into database
 Added more test cases