Merge pull request #1 from yamamushi/develop

Directories
Merge pull request #1 from Fall3nSp0rk/master

Merge Upstream Master
Merge pull request #4 from yamamushi/develop

Develop Branch Merge
added quit key
Merge pull request #5 from kylelk/master

added quit key
Merge pull request #6 from yamamushi/master

Quit Key Merge