added holidays and fixed a bug
conflict?
works again
Merge branch 'develop' into feature/mitegem