brand new vm
Merge branch 'master' of https://git.epicdns.io/15

Conflicts:
	db.jupis
Adding spenden.