Resolved conflicts and fixed syntax errors in HolidayController
Merge branch 'master' of https://github.com/Groarq/tablica