Added models for Case, UsersCases, and Evidence
Models and migrations created
Added models for Comment and votes
set up controllers and user migration and model created by clearance
we are still trying to figure out how to user clearance and customize it to
our needs
Merge the User model and migration from Clearance into other models
Merge branch 'CONTROLLER' of https://github.com/fence-lizards-2014/Jury into models
Dummy dashboard page
- Deleted rails index page
- added iJury logo assets
- changed route to go to welcome/#index
- added welcome_controller
- created index.html.erb and 3 partials.
Merged User model, udpated validations, mass attributes and field names
this is the initial controller commit without using clearance gem
this adds the rails framework with pages, sessions, tests, and users controller. Initial routes are also added.  Authentication for sign up/ sign in/ log out is complete. User model and migration complete
Added model tests for evidence and case
Merge branch 'models' of https://github.com/fence-lizards-2014/Jury into CONTROLLER_2

Conflicts:
	app/controllers/pages_controller.rb
	app/models/user.rb
	app/views/pages/main.html.erb
	app/views/users/_sign_up.html.erb
	config/routes.rb
	db/schema.rb
deleted all the markers for the merge process
fixed merge comflict
deleted duplicate user migration. deleted one was from clearance gem
Merge branch 'DASHBOARD' of https://github.com/fence-lizards-2014/Jury into CONTOLLERS_MODELS_MERGED

Conflicts:
	config/routes.rb
we connected dashboard template to sign-in sign-out
connected view and dashboard
Views - created cases/new.html, pages/dashboard.html
Model - rebuilt User/Case/cases_users migrations and models
Dashboard - rendering @mycases.title on page
Users model - corrected cases_user association
Created Case views as follows - show, casebody partial, also created case css file.
Pulled updated DASHBOARD_CASES and resolved merge confilct in users controller (spaces only). No other merge conflicts to resolve.
Merge branch 'DASHBOARD_CASES' of https://github.com/fence-lizards-2014/Jury into DASHBOARD_CASES

Conflicts:
	app/controllers/users_controller.rb
Added 2 Controller Tests for the user controller
- 1st test checks to see if count of users increases by 1 if a user is created. The second test checks to see if after a user is created that the website redirects back to the test_url. This will be changed when we figure out where it will eventually redirect back to. Ajax may break these tests.
Created new case form, User/Case/CasesUser models updated with new accessors, DB migrations updated.
DB seed file created.
Def create in controller Work in Progress