component#new. still need #component#show... i think
Merge branches 'chris' and 'master' into chris
restored schema.rb