Merge pull request #1 from howsyourface/timsChanges

new commit by tim
Merge branch 'master' of github.com:howsyourface/codeReviewTest into timsChanges