7-17
Merge pull request #1 from athleticoffice/master

7-17 dexter