Update .gitignore
Began work on New Enchant: Ender Field...

…Suppresses teleports in area. Conflicts with teleport, obviously
Resolve Conflicts

Conflicts:
	src/main/java/enderglove/common/config/Config.java
	src/main/java/enderglove/common/item/ItemEnderGlove.java