Merge pull request #7 from chriscct7/master

justin's
Pull to Trunk
Merge pull request #8 from chriscct7/dev

Repo update