adding one on one methods for accessing a list of one on ones from a user model
added tests for one-on-ones methods
commented out cranky bootstrap sass gem and added a migration to add course id to one on ones
added has_many, belongs_to relationship between one on ones and courses
all tests passing; added tests and instance methods for models. 100% test coverage for models, plus info in controller on how to use the new methods for accessing one on ones.
Commit to bring repo up to date.
Fixed merge conflict in schema.rb.
merge
Merge branch 'master' of github.com:darkmoves/ga_student_manager into users_controller