testing new branch

forking branches to merge later, scrum technique to control individual
progress
Merge remote-tracking branch 'origin/master' into KristelBranch