have to merge this with amogh reddy's stupid code
Merge branch 'team_reg' of github.com:AmoghReddy/engineer2013 into team_reg