fix .gitignore
Merge branch 'dev' of github.com:mutarock/THK-Web-Django into dev