remove conflict flag on README.md
add my name and team name to README.md
Merge pull request #1 from gyfelton/master

remove conflict flag on README.md