Merged master and remote README. Fix conflict.