Merge branch 'master' of github.com:Najtmare/artfactum into Najtmare-master
Merge branch 'Najtmare-master' into #86-Najtmare