initial commit
Merge branch 'master' of github.com:FluxAugur/fluxcode
adjusting .gitignore
Merge branch 'master' into develop