today
Merge branch 'master' of github.com:SuperFredo/GDCC

Conflicts:
	app/controllers/clients_controller.rb
	app/controllers/comptes_controller.rb