WIP adding carrierwave to mugshot and testing
fixed merge conflicts i think
more merge conflict fixes
fixed merge conflicts correctly
Working file upload for create and edit mugshot
fixed whitespace issues
removed accidentally uploaded images
Merge pull request #28 from LaunchAcademy/add_cw_to_mugshot

Add cw to mugshot