Merge remote-tracking branch 'origin/master' into kirik

Conflicts:
	anacondaz/img/live2.jpg
	anacondaz/index.html
	anacondaz/live.html
	anacondaz/style.css