Merge pull request #12 from gaudiomatthew/master

Profile Work
Merge pull request #13 from gaudiomatthew/derek/team_A

Merge pull request #12 from gaudiomatthew/master