Removed turbolinks
Changed render 'edit to render :edit for consistency
Merge branch 'master' of https://github.com/cvetter34/project3 into tools-list
Fixed by spec files renaming misspelled user_controller_spec.rb to users_controller_spec.rb
Merge branch 'master' into tools-list
Renamed to users_controller_spec.rb
Added spec for tools controller
Fixed merge conflicts for routes and user controller
Merge pull request #11 from xamroc/tools-test

Tools test written