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
UsersController
UsersController
UsersController and view but still with errors
Merge branch 'master' of git://github.com/Groarq/tablica into moonrise
conflict
Merge branch 'master' of git://github.com/Groarq/tablica
Deleted some trash fies
Merge branch 'master' of git://github.com/Groarq/tablica
ffs unexpected )
Merge branch 'master' of https://github.com/Groarq/tablica
some syntax fixes
hoursPlan typo fix
tooltip over hoursplan
added some devise link in navbar