app recovering
Merge branch 'master' of https://github.com/michaelvial/vikings