Modified to work within cygwin on windows.  Hopefully it will also work on Unix based systems
Updated gitignore to play nice with IntelliJ
Merge remote-tracking branch 'upstream/master'
Merge pull request #2 from KayoticSully/master

Just testing this out.