Update .gitignore
Update .gitignore
Merge branch 'master' of https://github.com/bau5/EternalCraft
Test
Rename item.java to Item.java
Rename itemInfo.java to ItemInfo.java
Merge remote-tracking branch 'upstream/master'
Update for conventions, moved stuff around.