added CAS authentication client
Merge pull request #1 from Mebibyte/login

added CAS authentication client
comment out CAS authentication stuff
Merge pull request #3 from Mebibyte/login

comment out CAS authentication stuff
Merge pull request #2 from DAHeath/ui_and_teams

Ui and teams
Merge pull request #1 from tylerpnn/test

Pull changes
Merge pull request #4 from DAHeath/master

Sessions for students
Added the upload form view and controller
Proposal page accessible from http://<local server>/proposal/proposal. Probably needs to be changed to be a static_pages/ URL. Need to implement form submission handling.
Template for new proposals was missing in last commit, probably due to me being a moron. Renamed controller to more closely match existing senior design model. Template is being rewritten and isn't finished yet, but can be viewed when running the server at http://<server IP:port>/projects/new
Filled out Technical and Director fields
All form items listed. Need to implement acceptance of form data into server-side storage.
Added model Project. Attributes are viewable in db/migrate/<timestamp>_create_projects.rb. Have yet to test submitting contents to database, attributes listed in template may be incompatible with those defined in model. Expect one or the other to require change.
Merge pull request #6 from Mebibyte/sjklein92

Add UI for sponsors submitting project
Import CSV file adds students to DB
Submitting Forms works
Fixes to controller attributes.
Merge branch 'DAHeath-master' into test
Merge branch 'test' of https://github.com/tylerpnn/CS3300-Senior-Design into test

Conflicts:
	app/controllers/application_controller.rb
	config/routes.rb
	db/schema.rb
Merge