removed conflicting files for merge with new release
docs added