small changes
did stuff
Merge branch 'master' of github.com:mromrell/quotadeck-backend

Conflicts:
	apps/public/views.py