Merge branch 'screw_django' of github.com:AmoghReddy/engineer2013 into screw_django
Merge branch 'team_reg' into schedule
adding updates feature
added adventure
added sponsors
conflicts fixed