add my name
Merge branch 'test1' into develop
add * to 2 files
Merge pull request #2 from FityCity/develop

add viola to team list