first commit
first commit
Merge branch 'master' of https://github.com/ldoroshe/testdjango

I need this merge because i'm stuck