green shit
fixed some stuff
Merge branch 'screw_django' of github.com:AmoghReddy/engineer2013 into screw_django