showing willie
more show
Merge branch 'master' into integration
Merge pull request #3 from weaties/master

testing to see what happens when we do a pull from master into trunk, which will create  a new commit, and then merge trunk into master