Merge branches 'chris' and 'master' into chris
Merge branches 'chris' and 'master' into chris
restored schema.rb