Trying to merge with tyler
Merge branch 'master' of https://github.com/mwm314/DMTReasonerFix

Conflicts:
	DMTReasonerFix/src/main/DMTReasoner.java
	DMTReasonerFix/src/test/TestDMTReasoner.java
	DMTReasonerFix/src/test/TestOntologyRead.java
Merge branch 'master' of https://github.com/mwm314/DMTReasonerFix
Added some unit testing and extra ontology files