readme update conflict
Merge branch 'master' of https://github.com/duke-compsci308-fall2013/example_git