Removed
Merge branch 'master' of https://github.com/PolyNerd/Block

Conflicts:
	bin/com/nerdyhype/block/Boot.class
	src/com/nerdyhype/block/Boot.java