after revert
Merge branch 'master' of github.com:Ballings/tesRepo2

Conflicts:
	function1.R
after revert