testing

Merge branch 'master' of ssh://github.com/b97jre/Revolution

Conflicts:
	ASEcalculations.R
some minor changes

Merge branch 'master' of ssh://github.com/b97jre/Revolution

Conflicts:
	ASEcalculations.R