merge tester.R from bdb
viewport fix
changed rules
Merge branch 'master' into brumdebug

Conflicts:
	experiment1.R
	tester.R