django code 10-24-14
Merge branch 'master' of https://github.com/katrusso/LabHelpers