made changes to model
Merge remote-tracking branch 'upstream/master'
not done yet
reorganized computer.rb methods
Create game-
- made changes to schema in Pick table
- made changes to Update controller
- game is working zero errors
Merge remote-tracking branch 'upstream/master' into tying_front_end_to_back_end
refractored code for computer controller
Merge remote-tracking branch 'upstream/master' into tying_front_end_to_back_end

Conflicts:
	app/controllers/update_controller.rb
Merge pull request #34 from sidpatel13/tying_front_end_to_back_end

Tying front end to back end
fixed css conflict / added container div
Merge pull request #35 from sidpatel13/tying_front_end_to_back_end

fixed css conflict / added container div
Merge branch 'master' of https://github.com/red-spotted-newts-2014/FantasyFootballMockAwesomeness