I don't remember what happened here
Keywords model and insertion of departments, subjects, and keywords
Strategies controller fix
bla bla bla
Merge branch 'scott' of https://github.com/TeachingStrategiesDatabase/Zinfandel
Adding keywords model
Added style and ease
I added a space
Custom page entries works!
Multiple select for searches works
Merged scott into master
Authentication of ownership before update or destroy works
bla
Style changes
'i lost HEAD'
Keywords work
Merged mitchell into master
More styles
Final styling before TESTING DAY
Merge branch 'master' of https://github.com/TeachingStrategiesDatabase/Zinfandel into jingwei

Conflicts:
	app/controllers/strategies_controller.rb
	app/models/strategy.rb
	app/models/strategy.rb~
	app/models/user.rb
	app/views/static/_header.html.erb
	app/views/strategies/search.html.erb
	app/views/users/admin.html.erb
	notes.txt