Updated README.
Updated to new files.
Merged.