virtula box changes
Merge branch 'master' of https://github.com/aurielfournier/RMark

Conflicts:
	encounter_histories.R
	enhist.csv