s03-us48: created test file, not ready
s03-us48: working database + written/non-functional test case
s03-us48: finished + working unit test. Ready for merge
fixed conflicts