test commit
Merge branch 'master' into scaffold
Merge branch 'master' into scaffold
people views/controller
Merge branch 'master' into scaffold

Conflicts:
	config/routes.rb
Merge branch 'master' into scaffold

Conflicts:
	config/routes.rb # resolved

Scaffolded about 25 controller/views
Added resources statement for each controller/view in routes
Dashboard demo shows list of available forms and allows user to go back and forth to forms index page.
Added TaxonNameClassification and TaxonNameRelationship controllers/views and included them in the dashboard index.
Fixed all but 2-3 people tests in spec/views
Merge branch 'master' into scaffold

Conflicts:
	app/controllers/taxon_names_controller.rb
checkpoint
Trivial addition to check branch creation.
Merging existing scaffolding.
Merge branch 'master' into scaffold
Merge authentication and scaffold.
Staging point.
Merge branch 'master' into scaffold
Biocuration errors resolved.
Resolves respositories specs.