Gemfile and college_spec.rb
Partial merge toward HEAD
Added Gemfile.lock
fixed issue #10
Merging in pull request #13

Fixes #10
Re-generated docs update