changing README to use reset rather than merge, to allow force pushing (and avoid server side conflicts)