changed the first line
merging conflict resolution
Merge branch 'master' of https://github.com/andreakal/bmc_test