Merge pull request #1 from HarpyWar/master

Sync with Harpywar
Change line endings from Unix to Windows
Merge pull request #53 from xboi209/master

Change line endings from Unix to Windows