add production gem
add mysql do dev env
Set up puma, nginx & capistrano
update deploy
inté home
feature/sami add admin
fix bug
feature/sami add calandar
feature/sami add array for production
feature/sami init capifony
Merge branch 'dev' into feature/rouksana
fix capistrano
add master
update gemifle
Merge branch 'feature/amilti' of ssh://github.com/Rayderxx/appli-campus into dev

Conflicts:
	Gemfile
	app/assets/javascripts/ng-app/app.js
	app/assets/javascripts/ng-app/controllers/agenda.js
	app/assets/javascripts/ng-app/controllers/profile.js