Fix
Merge branch 'master' of https://github.com/emrickgarrett/Team2CodeForGood
Merges, bleh