clean out .orig files from conflicting merge
play with views
playing with views 2
Merge branch 'views_searching'
add user authentication, start users_controller

issue with users#edit where spec passes when edit method does not include anything