Merge pull request #12 from ChristianMurphy/develop

updating master with latest stable
Merge branch 'master' of https://github.com/ChristianMurphy/gateway into develop
Merge branch 'develop' of https://github.com/ChristianMurphy/gateway into develop
Need init in gateway folder or it won't recognize it as a module. Pretty bad I didn't notice this
Merge pull request #18 from BrandonSleater/develop

bug on app folder