avancement sur le profil, background ok
Merge pull request #5 from BaptisteHamain/add_devise

models users and adresses created
fixing conflict
Merge pull request #6 from BaptisteHamain/first_design_app

avancement sur le profil, background ok
change made on master in gemfile.lock
insertion JS sur process
Merge pull request #7 from BaptisteHamain/first_design_app

insertion JS sur process
Merge pull request #8 from BaptisteHamain/add_devise

nettoyage
factorisation + organisation du CSS
Merge pull request #9 from BaptisteHamain/first_design_app

factorisation + organisation du CSS
on peut maintenant  se ogger, déloguer sur le site
Merge branch 'button_logout'
Merge branch 'master' of github.com:BaptisteHamain/refizz

Conflicts:
	app/views/postcards/index.html.erb
trajet avec JS pour envoi PC
Merge pull request #11 from BaptisteHamain/fixed_newviewbug

trajet avec JS pour envoi PC
facebook connect OK