mving README
pulling TODO list to toplevel
fixing conflicts