2 commits

Author	SHA1	Message	Date
Kevin K	5a06a8270a	fix(Requirements): fixing requirements and conflicts for issue 1158 ... Fixes requirements and conflicts on the v3 branch Closes #1158	2018-07-31 23:32:11 -04:00
Kevin K	e5def030d3	refactor(Modules): moves the modules around into a more logical order to make contribution easier	2018-06-12 11:44:40 -04:00