testing a git gui
Merge branch 'master' of github.com:dustinRDF/Spoon-Knife

testing git