Sportal:
Updated sportal.
Added scripts to load recommended as well as taken courses.
Started updating view to use data from Database.
renamed
Sportal
Added some methods to store selected courses.
Merge pull request #1 from esofomuso/develop

Esona_Develop
Initial commit to bitbucket
Merge branch 'master' of https://bitbucket.org/mikeodell77/sportal

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	app/assets/javascripts/angular/controllers/StudentCtrl.js
	app/assets/javascripts/welcome.js
	app/controllers/welcome_controller.rb
	app/models/course.rb
	app/models/grade.rb
	app/models/user.rb
	app/views/layouts/application.html.erb
	app/views/shared/_left_sidebar.html.erb
	app/views/shared/_right_sidebar.html.erb
	app/views/welcome/index.html.erb
	bin/bundle
	bin/rails
	bin/rake
	config/routes.rb
	db/schema.rb
	db/seeds.rb
Merge branch 'master' of https://github.com/tulaseerao/sportal

# Via Esona Fomuso (1) and Mike O'Dell (1)
* 'master' of https://github.com/tulaseerao/sportal:
  Sportal Added some methods to store selected courses.
  renamed
  Sportal: Updated sportal. Added scripts to load recommended as well as taken courses. Started updating view to use data from Database.

Conflicts:
	.gitignore
	.rvmrc
	Gemfile
	app/assets/javascripts/welcome.js
	app/controllers/welcome_controller.rb
	app/models/course.rb
	db/schema.rb
	lib/seeds/loader.rb