Login functionality added
Merge branch 'master' of git@github.com:suegrimes/ISCC_LIMS.git
Work in progress - first pass add sample form
Work in progress - samples entry/edits
remove development.log from index
Merge branch 'master' of git@github.com:suegrimes/ISCC_LIMS.git
Work in progress - sample entry forms
Email notifications for signup, and forgot password
Include login authentication within controllers.
Merge branch 'master' of git@github.com:suegrimes/ISCC_LIMS.git

Conflicts:
	app/controllers/application_controller.rb
	app/controllers/sessions_controller.rb
	app/controllers/welcome_controller.rb
	config/routes.rb
Add update capability for user profile
Add 'cancan' authorization
Merge branch 'master' of git@github.com:suegrimes/ISCC_LIMS.git

Conflicts:
	app/controllers/samples_controller.rb
	app/models/sample.rb
Misc edits, bug fixes
Modify ability.rb, add fields to samples/index view
customizing layout application page and adding dependent files for top nav if used
application.html - modified width
application.html - added Run Directories to top nav
working on University name
application.html - header - added affiliated institution, cleaned left nav