initial commit
Merge branch 'master' of github.com:emag1c/tyrion

first merge