now compiles started work on heirarchy view
Merge branch 'master' of https://github.com/mp4/Mastiff

some message
more message
fixed compiler errors