Rescue errors
Merge branch 'master' of github.com:Tho85/lunchpad