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