added readme file
simple steps to set up git
modified the readme
updated readme
fixed merges