beginnning
Merge branch 'master' of github.com:karatekid/djangoGen