Merge pull request #104 from SixAppeal/secret-feature

Nathan fucked everything up
small changes to start working on reports

author: nhhughes
Merge remote-tracking branch 'origin/devel' into devel
added in graph theory!

author: nhhughes
Merge branch 'devel' into secret-feature