pull error...
first
merge
Controle des experts a la racine
Setting up experts and rating pages.
fixed controller before merge
Merge branch 'extendedmodel' into develop

Conflicts:
	app/controllers/experts_controller.rb
	app/controllers/judges_controller.rb
	app/controllers/missions_controller.rb
	app/controllers/ratings_controller.rb
	app/controllers/skills_controller.rb
	db/migrate/20141119203503_create_experts.rb
	db/seeds.rb
Prepare pricing page
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	app/controllers/missions_controller.rb
Correct migration
Remove temporarily pending tasks
seeds.rb
initializing rating
merged
seeds.rb
;khgfefe
Merge remote-tracking branch 'origin/develop' into develop
continuing ratings
Merge branch 'develop' of https://github.com/greggz/aiop-project-final into develop
Setup skills