merging from origin
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:ajschumacher/gadsdc1
not working.
not quite there yet
cleaning
Merge pull request #74 from julbright/master

close, but not yet