Added conditional compilation and better makefile.
Added test for if vs virtual method.
Written the report, some polishing.