why doesn't mine show up?
Merge branch 'master' of https://github.com/CodingBliss/Plugins

Conflicts:
	bin/plugins/DavidsPlugin.class