updated readme
moved test files into test dir
updated readme
made changes on release branch for testing merge conflict