various
Merge branch 'master' of https://github.com/dcangst/fitr

Conflicts:
	.Rapp.history