initial commit

Alpha version 1
Merge branch 'master' of https://github.com/nsasto/canjango