added diff function
remove parenthesis in return statement of diff
added a new line at end of convenience.hpp
Merge pull request #40 from mebrooks/master

added diff function