catching errors
Merge branch 'master' of github.com:catstavi/Rails-FarMar