Added comments
Merge branch 'mytest'

Conflicts:
	cavity.dat