added venue info as requested by Robert S.
Merge remote-tracking branch 'upstream/master'
bug, netokracija and racunalo.com banners added
Netokracija title from Media to Regional Media

Like we agreed on last IRC meeting, because
Merge remote-tracking branch 'upstream/master'

Conflicts:
	index.html
spaces to tabs
tabs to spaces no2
added venue info as requested by Robert S.
Netokracija title from Media to Regional Media

Like we agreed on last IRC meeting, because
spaces to tabs
tabs to spaces no2
Merge branch 'master' of github.com:sveby/conference.o.o

Conflicts:
	index.html
fixed whitespaces?
added media reference to Libre! magazine
Merge pull request #28 from sveby/master

Added venue info as requested