Merge branch 'master' of git://github.com/ifarup/tc1-82

* 'master' of git://github.com/ifarup/tc1-82:
  Added Django web app
Merge branch 'master' of git://github.com/ifarup/tc1-82