minchange
Merge branch 'master' of https://github.com/hesham8/musebot

Conflicts:
	MuseBot/bin/mainFrame.class
	MuseBot/src/mainFrame.java