initial commit
fixes #2: adding submission feat

Author: Cole R. & Neil M.
Commit: Cole R. & Neil M.
-added entries route
-created new and create methods to entries controller
-added simple form gem
-added _form and new pages for entries
-added scope WhiteCard.all in entries_controller
adding files that were not staged
Fixes Number 2
Author: Cole and Neilson
Commit: Add home and submit links to index page.
Change seed number to 2.
Add dropdowns for white and black cards in entry submission form using simple form.
Update .gitignore
Fix Number 2
Author: Cole and Neilson
Commit: Change entries in seed file to 3.
Validate entry model for presence of white_card, black_card and playa
Add white_card_id, black_card_id, and play_id to accessible attributes in entry model.
Fake playa id in entries controller for entry saving tests
Fix number 2
Author: Cole and Neilson
Commit: Rename Playa email to user
Update db schema
Subject: Merge with Will
Author: Cole, Neilson, Chuck
Commit: Change references from white_card to white_cards.
Subject: Add order to white_cards
Author Cole, Neilson, Will
Commit: Add a order field to entries_white_cards
Subject: Fix entries_spec
Author: Cole, Neilson, Will
Commit: Updated entries_spec to take into account multiple white_cards merge
Add .autotest and TODO files
Merge branch 'master' of github.com:portlandcodeschool/humanitywar-rails into newentry

Conflicts:
	app/controllers/entries_controller.rb
	app/models/entry.rb
	app/views/entries/index.html.haml
	app/views/layouts/application.html.haml
	config/routes.rb
	spec/models/entry_spec.rb
Merge with PCS Master
Merge pull request #44 from vosechu/newentry

fix submission, add validations
Merge branch 'master' into newentry2

Conflicts:
	Gemfile
Merge branch 'newentry2'

Conflicts:
	Gemfile
	app/controllers/entries_controller.rb
	app/models/entry.rb
	app/models/playa.rb
	app/views/entries/_form.html.haml
	db/seeds.rb
adding error styles for submission