colton updates
Merge pull request #5 from Chronicbeard/colton

colton updates