Merge pull request #28 from cassiemoy/ajaxify_picks

Ajaxify picks
Merge pull request #29 from cassiemoy/ajaxify_picks

added computer functionality that randomly chooses draft pick when user ...
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
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
Fix merge conflict.