test
bcrypt deleted
Merge branch 'post'

Conflicts:
	Gemfile
change
error
c
error
e
e
e
e
e
front added to back
current challenge
challenge
c
merge damien eloi
merge eloi damien 2
merge
Merge branch 'new_view'