added carrier wave and photo upload
im not sure why the merge is necessary, this is all new to me

Merge branch 'master' of https://github.com/danvoell/Simple-Rails-Listing-and-Profile-Design