going to try and limit the result by the time
Merge branch 'master' of https://github.com/icHackers13/teamA
Merge branch 'master' of https://github.com/icHackers13/teamA