Committing Changes to merge program into one project

Changes made were Josh's code was added to me and Dori code. Testing is
needed to make sure there is no conflicts.