non-root mounting
Merge branch 'master' of github.com:pog992/pzrank

Conflicts:
	settings.py