ticket:1 edit tests
ticket:1 edit makefile
ticket:1 edit settings
ticket:1 edit settings
ticket:1 collectstatic
ticket:1 collectstatic
ticket:1 added static to urls.py
ticket:1 edit makefile
ticket:1 edit settings
ticket:4 solve conflict