basic class changed in test branch
Merge branch 'master' of github.com:fpalomo/test-conflicts-github into test
Merge pull request #1 from fpalomo/test

basic class changed in test branch