fourth commit
commit
Merge pull request #2 from angryTit/feature/fife-feature

Feature/fife feature