added second line
added second line
fixed merge conflicts
Merge branch 'stratcom-master'