test branching
redo ignore file
Merge pull request #1 from rlhotovy/TEST_BRANCH

Test branch