Merge pull request #29 from stilldabomb/master

Fixed things
Merge pull request #30 from stilldabomb/master

Fixed something
no message
Merge branch 'master' of https://github.com/ClashOfBlocks/ClashOfBlocks

Conflicts:
	src/not2excel/api/command/handler/Handler.java
fixed that command bug aperx
just tested a build with it
Fixed a few other NPE's that should have been fixed with the previous commit
Also fixed a recursion error with commandPrefix for usage display
removed the <===***===>
Merge pull request #31 from Not2EXceL/master

Derp
Delete ClashOfBlocks.xml
Merge pull request #32 from stilldabomb/master

Added potion support
Merge pull request #6 from ClashOfBlocks/master

Merge