modified:   ircBot/BotBrain.py
	modified:   ircBot/BotBrain.pyc
	renamed:    ircBot/ircBot.py -> ircBot/irc.py
	new file:   ircBot/irc.pyc
	deleted:    ircBot/ircBot.pyc
	modified:   ircBot/main.py

	modified:   ircBot/BotBrain.py
	modified:   ircBot/BotBrain.pyc
	renamed:    ircBot/ircBot.py -> ircBot/irc.py
	new file:   ircBot/irc.pyc
	deleted:    ircBot/ircBot.pyc
	modified:   ircBot/main.py
	modified:   ircBot/BotBrain.py
	modified:   ircBot/irc.py
	modified:   ircBot/main.py
Merge github.com:Duality4Y/DuaBot

Conflicts:
	ircBot/BotBrain.py
	ircBot/BotBrain.pyc
	ircBot/irc.pyc

	modified:   ircBot/BotBrain.py