Init commit
Merge branch 'master' of https://github.com/ritschard/publicpee.org

Conflicts:
	app/models.py
	manage.py
	requirements.txt