Merge pull request #199 from hebbet/master

Aleksander Machniak

2014-06-26 1edd6bd6e2751a6597760b676e713a916defe5f0

../../program/resources does not exist in tree fb40ae385ad6e2201e9f688cffa3c48d57358964