Add carrierwave for image uploads
add logic to offer pic upload if no pic
fix merge conflict
merge from master
add save picture button
Merge branch 'master' of https://github.com/nicholaspsmith/crossfithub