init
Merge branch 'master' of github.com:lyroge/mydjangoproject.com