gamla

Conflicts:
	fonts/Thumbs.db
	img/Thumbs.db
	img/myndir/Thumbs.db
	index.html
	javascript/effectar.js