a few changes made, check changes
Merge branch 'master' of https://github.com/paulymc/GroupProjectGroupD