Merge pull request #8 from flexfrank/team-A2-work

Team a2 work
task11