made on dev
 made on master on clone 2
Merge branch 'integration' into trunk
Merge branch 'trunk' into dev
Merge pull request #1 from weaties/dev

Dev
adding some pages as a test
showing willie
more show
again on hf
resolveing conflict
updating m.txt from github

playing with the idea of being able to maintain docs in github.
Merge branch 'master' into integration
Merge branch 'master' into int-milan
update readme to add some checkitems

seeing if the gfm works and actually pushes commits
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
Merge pull request #4 from weaties/trunk

Trunk pull request into integration
Merge branch 'master' into int-milan
Merge branch 'master' of github.com:weaties/testmm
updting .exp-flow file to support live branch, and master being the dev branch
Merge pull request #5 from weaties/master

promoting master into trunk