added ip
Merge branch 'featuretest'

Conflicts:
	Tester/Program.cs