altered ignored file
Merge branch 'master' of https://github.com/roberttyg/testproject