client-side update to readme
'merged' conflicts