deleted too much
Merge branch 'master' of https://github.com/adamschoenemann/ShepherdsTale