add b
add c
Merge branch 'new'
Merge pull request #1 from webfrogs/master

dfd