Konflikt 1...
Merge branch 'master' of github.com:Litheblas/litheblas