Gemfile and college_spec.rb
Partial merge toward HEAD
Added Gemfile.lock
Documentation updates

Newly generated docs updated.
Still trying to fix Travis...

Maybe this time?
I hate temp files

Updated gitignore and cleaned up after GEdit, which I still hate.
fixed issue #10
I can't spell...

How embarrassing, on the internet for all to see.
Merging in pull request #13

Fixes #10
Re-generated docs update
Fixes documentation issues in course.rb and location .rb
Merging changes from pull request #16

Fixes #9
Merge pull request #15 from eaholt06/migration-fixups

Fixes #11 documentation issues in course.rb and location.rb
Adding users, updating docs and coverage
Documentation updates

Basic documentation updates, just trying to make things consistent at
this point.
Merging down changes

Conflicts:
	app/models/course.rb
	app/models/location.rb
Cleaning up a useless .keep
Minor grammar and spelling edits
Fixed Issue #20