specs are running. not passing
Merge branch 'master' of github.com:SciMed/temptd
Event spec runs.
specs are running. not passing
Merge pull request #1 from dstywho/master

factory_girl factories
Merge branch 'master' of github.com:SciMed/temptd

Conflicts:
	spec/models/event_spec.rb
Edit down migration so it fits with the up
Add dependent destroy to some has_many associations

Timeslot votes
Event timeslots

Also, accept nested attributes for timeslots from
event
Event model changes and fix tests

* Remove attr_accessible type
* Now has_many votes through timeslots
* winning_timeslot method
Add OAuth migration.
work in progress on omniauth
devise user
Merge branch 'master' of 10.10.20.10:/projects/temptd

Conflicts:
	app/models/user.rb
Moving to Joe's computer.
Moving to Joe's computer 3.
WORK IN PROGRESS - Omniauth
Updated Rails to 3.2.10 to patch SQL injection vulnerability as per Michael's request
Removing extra migration
Updating gemfile
Whitespace changes