Themes et competences
Upload guillaume fini

Il faut faire le rezising des photo.
Il faut mettre les images dans la BDD
Merge remote-tracking branch 'origin/upload_photo' into master_merging_branch

Conflicts:
	mongoosepm/public/controllers/layout_controller.js
rectification suite au merge
Merge remote-tracking branch 'origin/update' into master_merging_branch

Conflicts:
	mongoosepm/public/views/user_form.html