update
Merge branch 'master' of github.com:dougc333/storm

Conflicts:
	storm-test4/bin/test4/demo/TestStorm1$TestStorm1Bolt.class
	storm-test4/bin/test4/demo/TestStorm1$TestStorm1Spout.class
	storm-test4/bin/test4/demo/TestStorm1.class