add style
link both files together
Merge branch 'develop'