Ugh
Merge branch 'master' of https://github.com/Shuetox/Managed-Logistics

Conflicts:
	src/main/java/com/shuetox/managedlogistics/tileentity/TileEntityComputer.java
Added functionallity for T D and P