CS-40 Fixing the build lint was failing
Merge branch 'master' of https://github.com/gr33nfury/cs3398Project