did more modification to .gitignore
fixed stuff I think
Merge branch 'master' of https://github.com/Croberson12/Crobertech