Ignore listi lisatud log.txt
Correction
Merge branch 'origin/master'

Conflicts:
	.gitignore
	modules/messagehandler.py
	web/ircweb/irc/static/irc/js/main.js
	web/ircweb/irc/static/irc/style.css
	web/ircweb/irc/templates/irc/base.html
	web/ircweb/irc/templates/irc/gif_panel.html
	web/ircweb/irc/templates/irc/index.html
	web/ircweb/irc/templates/irc/link_panel.html
	web/ircweb/irc/templates/irc/photo_panel.html
	web/ircweb/irc/templates/irc/youtube_panel.html
	web/ircweb/irc/templatetags/content_handler.py
	web/ircweb/irc/urls.pyc
	web/ircweb/irc/views.py
	web/ircweb/ircweb/urls.pyc
Merge branch 'origin/master'
Menu click now triggers ajax request instead whole page reload
Ajax loading animation
SQLLite intsead of MySql
Last commit missing files fix
Improved database transactions
Merge branch 'origin/master'

Conflicts:
	web/ircweb/irc/__init__.pyc
	web/ircweb/ircweb/__init__.pyc
	web/ircweb/ircweb/wsgi.pyc
Added gif thumbnails
Merge branch 'origin/master'
Fixed PIL installation
Merge branch 'origin/master'
New logging system, added broken link deleter
New logging system, added broken link deleter
Merge branch 'origin/master'
Installer bugfix
Merge branch 'master' of github.com:henriAbel/ircbot