Merge branch 'master', remote-tracking branch 'origin/master'
Merge branches 'toMerge' and 'master' into toMerge
Merge pull request #3 from ShawnEllis/toMerge

To merge