Setup django
Merge branch 'master' of https://github.com/berylw/sh_hackday_2014 into Mikhail-Pi

Setup django
Merge pull request #1 from berylw/Mikhail-Master

Mikhail master