Cleaned up imports
Merge branch 'master' of https://github.com/so72/DynamicNetworking.Calculator
Sorted merge conflicts. I think