complete tests for index views.  working on controller
all tests working for index controller
clean up merge conflicts
adding tests for bcrypt password methods to user model
Merge branch 'master' into uauth
half-finished bcrypt password methods
complete index controller tests
merge complete index controller tests with masterMerge branch 'master' into build_index_page
Merge pull request #11 from bengolden/build_index_page

complete index controller tests
commenting out work with Torey
Merge branch 'master' into uauth
Merge pull request #12 from bengolden/uauth

Uauth
current updates
resolved conflicts
Merge branch 'master' into UserDashboard