added simplecov
fixed merge conflict
merged
merge with emma's master branch
Merge branch 'master' of github.com:enspencer/ga_student_manager
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.
users controller updated.
merge
Merge branch 'master' of github.com:darkmoves/ga_student_manager into users_controller
Merge pull request #4 from abigezunt/users_controller

I fixed up the users controller.
Added sass-rails and twitter-bootstrap-rails gem. Bundled.
Ran rails g bootstrap:install. Now have bootstrap files and styles.
Added less-rails gem, bundled, deleted bootstrap_and_overrides.css.less and ran rails g bootstrap:install less.
Deleted about link and path from _header and application views. Removed an extra <%= yield %> from application view.
Added migration to include travis_url column for contributions.
Added migration to add travis_url column to contributions and migrated to update schema.rb.