Began working on simple combining
Merge branch 'master' of https://github.com/COP3503Project/Project