all good to go
Merge branch 'master' of github.com:lovodi/CSCI-21