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