initial commit
added info to readme
fixing merge errors