CarolineCaldwell/Software_Project — pull request #4 by CarolineCaldwell (2014-10-05 22:51:52+00:00)
Title: Update Caroline's branch

Adding Philip's changes to my current branch for testing.