final commit for the night
Merge pull request #1 from wylie/develop

final commit for the night