debugging rake assignments file. working on view.
Merge branch 'master' of github.com:project-camelback/camelback-rails into add-forks-to-views
halfway through
pull origin master
pull origin master
fix conflicts