Added master data and new favicon again
Finally added master-data
Merge pull request #1 from 120-team/master

Missed those when switching stuff between repositories