Merging of Team Files

Merge of files that have been worked on by all team members.