Authentication of ownership before update or destroy works
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
.
Merge branch 'master' of https://github.com/TeachingStrategiesDatabase/Zinfandel into jingwei

Conflicts:
	app/controllers/strategies_controller.rb
	app/models/strategy.rb
	app/models/user.rb
Fixed strategy destroy not working, and something else too
Now you can add a source on your strategies toooooo
Error messages for strategy update view
modified keyword when update
Update strategies now handles Department and Subject
Keywords work with strategy update
Merged jingwei into master
All is right in the world
Fix bug with page_entries cookie
Changed something in Admin view
Fixed user validation problem and login -invalid hash- problem