Getting ready to merge branches.
Merge branch 'master' of local repository into testing
Merge pull request #2 from dustinmhorvath/testing

Test merge.