add supervisor
Merge branch 'master' of github.com:alinefr/flask-blog

Conflicts:
	salt/base.sls
update user