Posts en consultation simple
Adding gems into Gemfile
cucumber
cucumber-rails
cucumber installé
Convert Vocables view erb to slim
Merge remote-tracking branch 'origin/template1' into templateMaster

Conflicts:
	Gemfile
	Gemfile.lock
add ruby git ignore file
correct git ignore
Spec test d'integration menu
Update layout
Correct some errors
Add gem slim to gemfile
Remove useless Gemfile.lock
test h1 sur vocable
Merge branch 'integration' of https://github.com/LeRubisNoir/multilengua into integration
Delete slim in Gemfile
Spec menu/topBar
Merge branch 'integration' of https://github.com/LeRubisNoir/multilengua into integration
Correct gitignore (Delete Gemfile.lock)