Merging manu's changes first
Merging manu's changes first

Signed-off-by: Daniel Lin <648875e9f013dca7dbd0baef1df663ff5c00ef9f@gmail.com>

DBKoolKids-assignment/AssignmentRepo,DBKoolKids-assignment/AssignmentRepo,DBKoolKids-assignment/AssignmentRepo