paperclip -mineur-
Merge branch 'master' of https://github.com/SelimJB/MedSpher

* 'master' of https://github.com/SelimJB/MedSpher:
  Création du controlleur categorie et du model de questions

Conflicts:
	db/schema.rb