Merge branches 'master', 'master' and 'master' of https://github.com/Ellendar/ScrollsAi
Merge branch 'master' of https://github.com/Ellendar/ScrollsAi
a