django framework setup
Merge branch 'master' of github.com:rjacevedo/Powerblock-Elite-Web