ajout
Merge branch 'master' of https://github.com/nicolasgiannuzzi/profilart

Conflicts:
	public/static/user_media/image/average/DSC_5360.jpg