Put test.cpp in same path as main.cpp
Merge branch 'master' of https://github.com/etf-sarajevo/buildservice