A great merge with no errors.

gistfile1.txt

Updating fefeb0c..3b85f14
Fast-forward
 .gitignore                                      |   1 +
 Gemfile                                         |  21 ++++++++++++++-------
 Gemfile.lock                                    | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 app/assets/javascripts/assignments.js.coffee    |   3 +++
 app/assets/javascripts/courses.js.coffee        |   3 +++
 app/assets/javascripts/study_plans.js.coffee    |   3 +++
 app/assets/javascripts/users.js.coffee          |   3 +++
 app/assets/stylesheets/assignments.css.scss     |   3 +++
 app/assets/stylesheets/courses.css.scss         |   3 +++
 app/assets/stylesheets/scaffolds.css.scss       |  69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 app/assets/stylesheets/study_plans.css.scss     |   3 +++
 app/assets/stylesheets/users.css.scss           |   3 +++
 app/controllers/assignments_controller.rb       |  83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 app/controllers/courses_controller.rb           |  83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 app/controllers/study_plans_controller.rb       |  83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 app/controllers/users_controller.rb             |  83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 app/helpers/assignments_helper.rb               |   2 ++
 app/helpers/courses_helper.rb                   |   2 ++
 app/helpers/study_plans_helper.rb               |   2 ++
 app/helpers/users_helper.rb                     |   2 ++
 app/models/assignment.rb                        |   3 +++
 app/models/course.rb                            |   3 +++
 app/models/study_plan.rb                        |   3 +++
 app/models/user.rb                              |   3 +++
 app/views/assignments/_form.html.erb            |  29 +++++++++++++++++++++++++++++
 app/views/assignments/edit.html.erb             |   6 ++++++
 app/views/assignments/index.html.erb            |  27 +++++++++++++++++++++++++++
 app/views/assignments/new.html.erb              |   5 +++++
 app/views/assignments/show.html.erb             |  20 ++++++++++++++++++++
 app/views/courses/_form.html.erb                |  29 +++++++++++++++++++++++++++++
 app/views/courses/edit.html.erb                 |   6 ++++++
 app/views/courses/index.html.erb                |  27 +++++++++++++++++++++++++++
 app/views/courses/new.html.erb                  |   5 +++++
 app/views/courses/show.html.erb                 |  20 ++++++++++++++++++++
 app/views/study_plans/_form.html.erb            |  25 +++++++++++++++++++++++++
 app/views/study_plans/edit.html.erb             |   6 ++++++
 app/views/study_plans/index.html.erb            |  25 +++++++++++++++++++++++++
 app/views/study_plans/new.html.erb              |   5 +++++
 app/views/study_plans/show.html.erb             |  15 +++++++++++++++
 app/views/users/_form.html.erb                  |  29 +++++++++++++++++++++++++++++
 app/views/users/edit.html.erb                   |   6 ++++++
 app/views/users/index.html.erb                  |  27 +++++++++++++++++++++++++++
 app/views/users/new.html.erb                    |   5 +++++
 app/views/users/show.html.erb                   |  20 ++++++++++++++++++++
 config/database.yml                             |  55 -------------------------------------------------------
 config/database.yml.example                     |  49 +++++++++++++++++++++++++++++++++++++++++++++++++
 config/routes.rb                                |   8 ++++++++
 db/migrate/20121106034607_create_courses.rb     |  11 +++++++++++
 db/migrate/20121106034902_create_assignments.rb |  11 +++++++++++
 db/migrate/20121106035010_create_study_plans.rb |  10 ++++++++++
 db/migrate/20121106035107_create_users.rb       |  11 +++++++++++
 db/schema.rb                                    |  47 +++++++++++++++++++++++++++++++++++++++++++++++
 52 files changed, 1054 insertions(+), 62 deletions(-)
 create mode 100644 Gemfile.lock
 create mode 100644 app/assets/javascripts/assignments.js.coffee
 create mode 100644 app/assets/javascripts/courses.js.coffee
 create mode 100644 app/assets/javascripts/study_plans.js.coffee
 create mode 100644 app/assets/javascripts/users.js.coffee
 create mode 100644 app/assets/stylesheets/assignments.css.scss
 create mode 100644 app/assets/stylesheets/courses.css.scss
 create mode 100644 app/assets/stylesheets/scaffolds.css.scss
 create mode 100644 app/assets/stylesheets/study_plans.css.scss
 create mode 100644 app/assets/stylesheets/users.css.scss
 create mode 100644 app/controllers/assignments_controller.rb
 create mode 100644 app/controllers/courses_controller.rb
 create mode 100644 app/controllers/study_plans_controller.rb
 create mode 100644 app/controllers/users_controller.rb
 create mode 100644 app/helpers/assignments_helper.rb
 create mode 100644 app/helpers/courses_helper.rb
 create mode 100644 app/helpers/study_plans_helper.rb
 create mode 100644 app/helpers/users_helper.rb
 create mode 100644 app/models/assignment.rb
 create mode 100644 app/models/course.rb
 create mode 100644 app/models/study_plan.rb
 create mode 100644 app/models/user.rb
 create mode 100644 app/views/assignments/_form.html.erb
 create mode 100644 app/views/assignments/edit.html.erb
 create mode 100644 app/views/assignments/index.html.erb
 create mode 100644 app/views/assignments/new.html.erb
 create mode 100644 app/views/assignments/show.html.erb
 create mode 100644 app/views/courses/_form.html.erb
 create mode 100644 app/views/courses/edit.html.erb
 create mode 100644 app/views/courses/index.html.erb
 create mode 100644 app/views/courses/new.html.erb
 create mode 100644 app/views/courses/show.html.erb
 create mode 100644 app/views/study_plans/_form.html.erb
 create mode 100644 app/views/study_plans/edit.html.erb
 create mode 100644 app/views/study_plans/index.html.erb
 create mode 100644 app/views/study_plans/new.html.erb
 create mode 100644 app/views/study_plans/show.html.erb
 create mode 100644 app/views/users/_form.html.erb
 create mode 100644 app/views/users/edit.html.erb
 create mode 100644 app/views/users/index.html.erb
 create mode 100644 app/views/users/new.html.erb
 create mode 100644 app/views/users/show.html.erb
 delete mode 100644 config/database.yml
 create mode 100644 config/database.yml.example
 create mode 100644 db/migrate/20121106034607_create_courses.rb
 create mode 100644 db/migrate/20121106034902_create_assignments.rb
 create mode 100644 db/migrate/20121106035010_create_study_plans.rb
 create mode 100644 db/migrate/20121106035107_create_users.rb
 create mode 100644 db/schema.rb