solution
fixed merge conflicts
fixed last conflict
restructured hierarchy of projects
Merge pull request #1 from numso/solution

Solution