made a few small changes
Merge remote-tracking branch 'origin/Cameron' into cameronBranch
Merge remote-tracking branch 'origin/Cameron' into cameronBranch
Merge remote-tracking branch 'origin/Cameron' into cameronBranch
Merge remote-tracking branch 'origin/Cameron' into cameronBranch
Merge remote-tracking branch 'origin/Cameron' into cameronBranch
Merge remote-tracking branch 'origin/Cameron' into cameronBranch