test
Merge branch 'master' of https://github.com/vodkajoey/Rmodel

Conflicts:
	test.txt