fixed merge conflict in html file
added template for readme, with each author and their github profile linked appropriately.