modified:   Gemfile
	modified:   Gemfile.lock
	new file:   app/assets/stylesheets/fonctions.scss
	modified:   app/assets/stylesheets/indirects.css.scss
	new file:   app/controllers/fonctions_controller.rb
	modified:   app/models/etude.rb
	modified:   app/models/mareva.rb
	new file:   app/views/fonctions/show.html.haml
	modified:   app/views/rentabilites/show.html.haml
	new file:   config/initializers/simple_form.rb
	new file:   config/locales/simple_form.en.yml
	modified:   config/routes.rb
	modified:   features/direct.feature
	new file:   features/fonctionnement.feature
	modified:   features/indirect.feature
	new file:   lib/templates/haml/scaffold/_form.html.haml