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
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
added the destroy method to user and some other fun things
Merge branch 'master' of https://github.com/geisler/game_contest_server into in_class

Conflicts:
	spec/requests/users_pages_spec.rb
Passing all tests
added styling stuff