marcos progress thus far
Merge branch 'master' of https://github.com/robinsonj/CSC667_GroupProject

combining repositories to have 1 single repo