committing final changes from Patty scrum session
merging with master