mixed
Merge branch 'master' of https://github.com/vilka2001/resourcer