1st commit from ubuntu
Merge branch 'master' of https://github.com/hvan021/djangotut