new file
Merge branch 'master' into develop
code reorg
code reorg
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	automatic_updates
git bash always Runs in the installed git dir..work around to get actual gitalias dir
fixing load issues on git bash