Made the makefile dependent on the hpp
Changed = operator to template
Added measurement = operator
Templated the += style operators
Added operators for any number type
Changed templates to oneliners
Updated test.cpp to be more informative (but is much harder to maintain)