'i lost HEAD'
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
modified keyword when update
Keywords work with strategy update
Merged jingwei into master
All is right in the world