idk
Merge branch 'master' of https://github.com/Klazen108/TwitchBot.git
Timer functionality & IRC Users
Merge branch 'master' of https://github.com/Klazen108/TwitchBot.git

Conflicts:
	Shadesbot/src/com/klazen/irc/ZuzuBot.java
PircBotX migration
Merge branch 'master' of https://github.com/Klazen108/TwitchBot.git

Conflicts:
	Shadesbot/src/com/klazen/irc/ZuzuBot.java