adam broke my shit
conflict resolution
Merge branch 'master' of https://github.com/ace8957/CodeForGoodTeam8