new feature
another file
Merge branch 'master' into dev_new_feature
Merge branch 'master' of github.com:snicky/newapp