User model with passwords, user show page
Added some extra stuff
deleted webrat.log
merging manually?
fixed a spec bug
Merge branch 'modeling-users'
deleted webrat.log. again.