first partial running prototype
Merge branch 'master' of https://github.com/Corky94/CM2301-Group-1-Software-Project