.
Merge branch 'master' of github.com:DrSkippy27/Gnacs
Merge branch 'master' of github.com:DrSkippy27/Gnacs
scripts and version number
merged conflicts