ran testing specs
Merge branch 'master' into profile
failed attempt at CarrierWave
Merge branch 'master' into profile
added photo upload with carrierwave for profile
resolved merge conflicts