CarolineCaldwell/Software_Project — pull request #13 by CarolineCaldwell (2014-10-30 14:33:18+00:00)
Title: Caroline to Master 

Adds changes made by Corbin, including algorithm.