added some comments made some minor edits
resolved merge conflicts
added orig files