Added has_many courses to major model
Merge branch 'jonah_local'
Adding JSON inport for majors
Fixed typo in major model
Merge branch 'master' of https://github.com/RPI-RCOS-PlanofStudy/PlanofStudy

Conflicts:
	app/models/course.rb
Merge branch 'master' into majors
merged in master
added veiws for seeing list of majors and showing individual majors
Added new json reproentation of majors
Merge branch 'master' into majors

Conflicts:
	Gemfile.lock
	config/routes.rb
added requirment model
Added database to .gitignore
Merge branch 'majors'

Conflicts:
	app/models/course.rb