Compiles correctly

added #ifndef where needed in .h files
last save
Merge https://github.com/asmusj/testing