Commit part 3!
Merge branch 'master' of https://github.com/katiholasz/EvoVacation.git
Part 4
Merge branch 'master' of https://github.com/katiholasz/EvoVacation.git