modified README.md
Merge branch 'master' of https://github.com/asy524/2014SpringProject