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