initial commit
fixing merge and modifying readme