commented testdata of ConflictData out
Merge branch 'master' of https://github.com/hhagmans/Ticket-Boys.git
adding Email field to Employee
replaced hardcoded mailadress with employee ones
Introducing Reminder for Conflicts, not fully implemented