First commit from work laptop
Merge branch 'master' of https://github.com/mwawrzyniuk/djangotutorial