* Added .gitignore
* Switched to permissions
Merge commit '6cfce52'
Convert remaining DOS line endings from Unix format.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/main/java/com/thevoxelbox/voxelport/VoxelPort.java
	src/main/java/com/thevoxelbox/voxelport/oldPort.java