rm
Merge branch 'master' of github.com:kevin386/djApp
merge .gitignore