add salma
fix merge conflict
Merge pull request #15 from ndomar/silvermist

add salma