Changed some values
Merge branch 'other'

Conflicts:
	cavity.dat