Added _admin-fields.html.erb and database_cleaner.rb  The cleaner file was supposed to help with selenium, but so far has not done so.
Preparing to merge with dev
Installed needed gems.
Made not working tests pending.
Merge branch 'admin' into dev

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/users_controller.rb
	app/views/users/_user.html.erb
	app/views/users/show.html.erb
	db/seeds.rb
	spec/features/users_pages_spec.rb
Last attempt at a merge...
Merge branch 'dev' into admin

Conflicts:
	db/seeds.rb
Sorta working. Failing 2 tests post-merge.
Tests passing, but implementation (regarding the flashes) is fishy.

Flashes were not showing up correctly, so put in the error message
partial in the users new and edit pages, even though these flashes
used to appear at the top of the page directly under the navbar.

Merge this branch separately.
Added comment standins for unfinished admin tests.
Editted seeds for presentation
Merge branch 'dev' of https://github.com/Philebrkr/game_contest_server_jterm into admin
Merge branch 'admin' of https://github.com/Philebrkr/game_contest_server_jterm into admin
Merge branch 'admin' into dev

Conflicts:
	db/seeds/development.rb
Merge in admin to dev working