Reverted to commit with message "updates to 6A and 6B"
fixed merge conflict in 6A
updated 6A and 6B exercises