add Name method
remove conflit marjo/alex
Merge branch 'master' of https://github.com/yostyle/CDPN-M1
remove conflit marjo/alex
conflit
Merge branch 'master' of https://github.com/yostyle/CDPN-M1