attempt branch consolidation
Merge branch 'userModel' of ssh://github.com/elliehoshi/project3_stylelust into userModel
add play view and update routes