getting updates

syncing changes from team also took out unused code
Merge branch 'master' of https://github.com/terrell1s/CaughtItHere