Add to CSS.
made initial modal box
made initial trasparent modal box
made css changes to modal box shadow
changed naming of modal background class
made divs hidden
Merge pull request #30 from aedwards12/modal

Modal
Create game-
- made changes to schema in Pick table
- made changes to Update controller
- game is working zero errors
Gemfile- upgraded bcyrpt-ruby version to correct bcrypt error
commented out display:none to show modal
moved users controller to welcome controller because the modal that displays user signup is in the modal on welcome page
changed user routes to welcome routes due to the modal
the index welcome page now holds the modal with user signup and login
Merge pull request #32 from sidpatel13/user_login_modal

User login modal
Merge remote-tracking branch 'upstream/master' into tying_front_end_to_back_end
Fix merge conflict.
Merge pull request #33 from cassiemoy/master

new css :) can merge now thank god
refractored code for computer controller
Merge remote-tracking branch 'upstream/master' into tying_front_end_to_back_end

Conflicts:
	app/controllers/update_controller.rb