compiling fails with

In file included from ../chocobun-core/core/CollectionParser.cpp:27:
In file included from ../chocobun-core/core/CollectionParserSLC.hpp:28:
../chocobun-core/core/CollectionParserBase.hpp:37:7: error: redefinition of 'CollectionParserBase'
Merge branch 'master' of https://github.com/nerdinand/chocobun into nerdinand
Merge pull request #2 from nerdinand/nerdinand

Nerdinand