README: updated git link
README: corrected launch file names
Merge remote-tracking branch 'upstream/master'

Fixed Conflicts in README.md