adding untracked files
Merge branch 'master' of https://github.com/TeachingStrategiesDatabase/Zinfandel

Conflicts:
	db/schema.rb
Merge branch 'master' of https://github.com/TeachingStrategiesDatabase/Zinfandel
commit
hi
finishing search by multiple options and multiple keywords
add department and subject models
Added admin view and ability to update available Departments and Subjects
Added authentication for admin, did a bit of restructuring
Stylin'
Reworking some code, in progress
Updated search to play nicer
Merged scott into master
Merged mitchell into master
Added validations for strategy
Merged sarah into master
Deleted all these tilde files
Minor changes
I don't remember what happened here
Keywords model and insertion of departments, subjects, and keywords