ch5 exercises
fixed ch5 exercises
Merge branch 'ch5' into ch6
ch6 exercises
Update user.rb
ch7 exercises
resolved conflicts
Finished ch8 with exercises and cucumber
Test ignore
merged ch8 exercises
fixed merge
ch9 exercises completed
fixed conflicts for ch9 exercise merge
fixed merge error