Improved Holiday, rspec tests
Improved validations in model Holiday and tests
conflict
Merging branches
Merge branch 'holiday'
Merge branch 'master' of git://github.com/Groarq/tablica
conflict
Merge branch 'master' of git://github.com/Groarq/tablica
Merge branch 'master' of git://github.com/Groarq/tablica