CRUD and Registration Views, Bootstrap, and CarrierWave

I want to compare what you and I have to try to resolve any merge conflicts.