removed merging
Merge pull request #18 from ItsAsbreuk/master

removed merging