Added cd
update before merge
merged conflicts in bwa_mapping
fixed merge before push