added a line
new line in file 2
Merge branch 'my_new_feature_1' of https://github.com/tomwilderspin/golden_master into my_new_feature_1