Courses View, Controller - Links not connected
Merge pull request #3 from zrivest/courses_view_and_controller

Courses View, Controller - Links not connected
added seeds to seed file
Merge pull request #4 from zrivest/seeds

added seeds to seed file
WIP working on parsing CSV
fix these changes
pulled master changes
added new join table for migrations
WIP on CSV parsing
Merge pull request #5 from zrivest/revised_models_migrations

added new join table for migrations
Merge branch 'master' of https://github.com/zrivest/smart_groups
added fixed models and migrations from master
added the ability to import and parse into the database
Added Login, BCrypt, 'Add CSV' Button
Merge branch 'master' into login_bcrypt

Conflicts:
	app/models/assignment.rb
Merge pull request #6 from zrivest/login_bcrypt

Login bcrypt
Added basic parser functionality with ability to add a course title
Merge branch 'master' of https://github.com/zrivest/smart_groups

Conflicts:
	config/routes.rb
Merge branch 'master' into csv_parser

Conflicts:
	app/models/assignment.rb
	app/models/student.rb
	config/routes.rb
Merge pull request #7 from zrivest/csv_parser

Csv parser