Quick fix
Changes to some files
Merge branch 'master' of https://github.com/emrickgarrett/Team2CodeForGood