Created basic waiting_room model, spec file, and migration
added WaitingList ref to task.rb, rearranged code and rdoc for better readability
Fixed syntax error in migration, committing new schema
Added factory and sanity-check spec for WaitingRoom
Basic specs for adding a task to waiting room and making sure no
duplicate tasks in waiting room
moved developer-facing README into doc/README_FOR_APP.md and made the toplevel README.md researcher-facing.  From now on please add developer-specific info to doc/README_FOR_APP.md.
Added preferred & minimum group size to Condition, including
validations, specs, and changes to scaffolded
views/conditions/_form.html.erb partial.
Changed Condition factory to specify group sizes, since required for validity.
added condition spec
Added conditions spec and changes to conditions controller spec to allow
passing with the validations on the group size attributes
Added date_validator gem to Gemfile to use for datetime validations on
models
Added start and end time and starts-every fields to ActivitySchema,
including validations, specs, and changes to the view
(views/activity_schema/_form.html.erb)
Modified activity schema factory and controller spec to include these
required attributes
Merge pull request #5 from p-tricky/chat_feature

Chat feature
locked rspec to 2.x, enabled per-branch dev and test databases
latest schema.rb
documented new @chat_group template field in README
initial model and specs for WaitingRoom
Merge branch 'feature/AF-group'

Lots of manual conflicts that were small but touched same pieces of files...
	Gemfile
	Gemfile.lock
	README.md
	app/models/activity_schema.rb
	app/models/condition.rb
	app/models/task.rb
	db/schema.rb
	doc/README_FOR_APP.md
per-branch DB now works when branch names have slashes
Bootstrap Installed
Bootstrap installed
added bootstrap to scaffold and updated gemfile with dependencys for bootstrap

modifying css on static page

added wrapper to static page

adding color

added a bit of style to welcome page

checkpoint for static page

working on adding explaination

revert to old edit
Added explanation/task on pivitol
explanation added

working with order

answer choices has 5 textboxes when updatting

Allowing array to be modified bug fix
fixing the form for edit

fixing gems

added cuc

Rebasing
Cucumber test for explanation done
updating features

5 answer choices

Cucumber test for explanation done

edit feature almost pass

finish question test
Javascript bug fix
fixed javascript bug
revert to working view

finish question test

Javascript bug fix
fixing css for form

corr css

fixed javascript bug

form fix and string problem resolved, ready for pull

compatability with heroku