yea, stuff again. also things.
Merge branch 'master' of github.com:kvalle/schmansible
Merge branch 'master' of github.com:kvalle/schmansible

Conflicts:
	foredrag/foredrag.key/Index.zip
	foredrag/foredrag.key/Metadata/Properties.plist
Merge branch 'master' of github.com:kvalle/schmansible