* dangerzone: parameter changes
* README.md: added main program
Merge branch 'test1'

Conflicts:
	dangerzone