oh god my .git directory disappeared why
Merge github.com:wooky/MiscPeripherals

Conflicts:
	.gitignore
	miscperipherals/item/ItemSmartHelmet.java
	miscperipherals/peripheral/PeripheralWirelessRedstone.java
	miscperipherals/tile/TileChargeStation.java
	miscperipherals/tile/TileTeleporter.java