cleaning up, i guess
Merge branch 'master' of https://github.com/icHackers13/teamA