fixes
Merge branch 'master' of https://github.com/Ilmen-vodhr/ilmentufa

Conflicts:
	ircbot/livla.js
formatting bugs