added infostrada
claranet07
Merge branch 'master' of github.com:NLNOG/ring-puppet

Conflicts:
	files/etc/hosts
	modules/amp/files/nametable
	modules/amp/files/schedule