Iss 11

Fixed merge issues in this branch, merging into teammates in preparation for merge to master