update final data
Set attributes to enforce crlf convert

Windows has different line ending with other OSes (such as Mac OS X,
Linux, BSD, Unix).  What even worse is that different `core.autocrlf`
settings may result in different line endings.  A proper settings in
.gitattributes will resolve this problem.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Resolve conflict in README.md

This conflict is bring into our system by commit 18f769f03

    Author: luyc <luyicai@126.com>
    Date:   Sat Sep 6 03:00:07 2014 +0800

        merge class three change list

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>