Working on merging versions and fixing bugs.
Merge branch 'master' of https://github.com/Owen2284/Group_Project_2