began to attempt to organize code into new files
Merge branch 'master' of ssh://github.com/NatalieP-J/Summer2014