changed cc_name attribute to string
errors showing
Merge branch 'master' of https://github.com/kemccabe/betsy_rails
order functionality working
fix merge conflicts