add in a UML diagram of the object model.
Merge pull request #119 from huit/docs/UML

add in a UML diagram of the object model.
Merge pull request #107 from tfhartmann/master

Adding Travis-ci Syntax checking and start for tests
Merge remote-tracking branch 'upstream/master'