Realized that removing bin,src from root was bad idea. reverted
update gitignore
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	bin/com/ExampleModName/Blocks/ExampleBlocks.class
	bin/com/ExampleModName/Main/MainClass.class
	bin/com/ExampleModName/Main/MainRegistry.class
	bin/com/ExampleModName/Proxy/ClientProxy.class
	bin/com/ExampleModName/Proxy/CommonProxy.class
	src/main/java/com/ExampleModName/Blocks/ExampleBlocks.java
	src/main/java/com/ExampleModName/Blocks/TestBlock.java
	src/main/java/com/ExampleModName/Conf/ModConf.java
	src/main/java/com/ExampleModName/Items/TestItem.java
	src/main/java/com/ExampleModName/Main/MainClass.java
	src/main/java/com/ExampleModName/Main/MainRegistry.java
	src/main/java/com/ExampleModName/Proxy/ClientProxy.java
	src/main/java/com/ExampleModName/Proxy/CommonProxy.java
	src/main/java/com/ExampleModName/Tools/Example/ExampleAxe.java
	src/main/java/com/ExampleModName/Tools/Example/ExampleHoe.java
	src/main/java/com/ExampleModName/Tools/Example/ExamplePickaxe.java
	src/main/java/com/ExampleModName/Tools/Example/ExampleShovel.java
	src/main/java/com/ExampleModName/Tools/Example/ExampleSword.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	bin/com/ExampleModName/Blocks/ExampleBlocks.class
	bin/com/ExampleModName/Main/MainClass.class
	bin/com/ExampleModName/Main/MainRegistry.class
	bin/com/ExampleModName/Proxy/ClientProxy.class
	bin/com/ExampleModName/Proxy/CommonProxy.class
	src/main/java/com/ExampleModName/Blocks/ExampleBlocks.java
	src/main/java/com/ExampleModName/Blocks/TestBlock.java
	src/main/java/com/ExampleModName/Conf/ModConf.java
	src/main/java/com/ExampleModName/Items/TestItem.java
	src/main/java/com/ExampleModName/Main/MainClass.java
	src/main/java/com/ExampleModName/Main/MainRegistry.java
	src/main/java/com/ExampleModName/Proxy/ClientProxy.java
	src/main/java/com/ExampleModName/Proxy/CommonProxy.java
	src/main/java/com/ExampleModName/Tools/Example/ExampleAxe.java
	src/main/java/com/ExampleModName/Tools/Example/ExampleHoe.java
	src/main/java/com/ExampleModName/Tools/Example/ExamplePickaxe.java
	src/main/java/com/ExampleModName/Tools/Example/ExampleShovel.java
	src/main/java/com/ExampleModName/Tools/Example/ExampleSword.java