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
Stylin'
Insertion update
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
Strategies controller fix