Added .gitignore
Trying to get Windows compatibility working..
Fixed issues causing errors on Windows
Updated .gitignore
Fixed merge conflict..