'merged' old and new readme