Merge pull request #1 from glennlopez/master

sync to eet
i loled...
Merge pull request #13 from redrivercollege-eet/master

sync request