added migration for everything except words
Merge branch 'master' of github.com:estreske/project2

Conflicts:
	db/schema.rb