Changed name of readme file
Merge branch 'master' of https://github.com/tinaowenmark/ProgrammingAssignment2

Conflicts: