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

seeing if the gfm works and actually pushes commits