django can find static files in smapchat/static
merge conflict ameliorated