yo
removed new
added users resources to routes.rb
Merge branches 'chris' and 'master' into chris