merge conflicts fixed
merge conflicts fixed

computationalEpidemiology/biobankAccelerometerAnalysis,aidendoherty/biobankAccelerometerAnalysis,aidendoherty/biobankAccelerometerAnalysis,computationalEpidemiology/biobankAccelerometerAnalysis