Feature: added file c
Merge branch 'master' into feature-branch