Added Bodo's testing code
Got confused with folder structure, moved task04 to task03,
combined the two Makefiles