added to .gitignore
Merge branch 'master' of https://github.com/jensenr30/De_Flux
rearranged main.c a little further