This is just so I can get his test cases
Merge https://github.com/geisler/game_contest_server into in_class

Conflicts:
	spec/requests/users_pages_spec.rb
Pulled file down from Geisler
Passes the first test
Fixed some things... had issues with rspec
Some DB stuff... but this isnt really working
Merge branch 'master' of https://github.com/geisler/game_contest_server into in_class

Conflicts:
	spec/models/user_spec.rb
Got stuff to work yo
please work`
I dont really know why i have to do this... pulling isnt working right...
Passes all of the new tests as of the 26th of September

Conflicts:
	spec/models/user_spec.rb
Merged in from inclass branch, fixes all tests as
26th of November
Test for user index and editing.

These tests are rudimentary tests to see if a user listing can be done
and whether a user can be edited after already in the system.  There
are loads of security flaws that could exist in an implementation that
are not addressed with these tests.  Those will come later after we
can be certain that users can log in to the system.
This is the updated package
I finished all the test and have users editting
and showign and stuff

Merge branch 'master' of https://github.com/geisler/game_contest_server into in_class

Conflicts:
	spec/requests/users_pages_spec.rb
Merge branch 'master' into in_class

Conflicts:
	app/views/users/show.html.erb
heres everything
Tests for deleting users.

These simple tests just checks that the list of users includes links
to delete and that when clicked they are removed from the system.
added the destroy method to user and some other fun things
Add tests for password field.

Do not allow password fields to be provided using text fields since
the text is visible on screen.