test
Merge branch 'master' of https://github.com/LarryBrick/DjangoProject
.gitignore is now working