Merge pull request #4 from maebeale/master

carrierwave setup
Fix controller specs
Merge branch 'master' of https://github.com/dazm12/yardbook