(cleanup) resolves more merge conflicts
(refactor) js/ folder becomes scripts/ and creates scripts/auth
(refactor) auto-injects <script> tags into HTML via Gulp task
Merge pull request #46 from loqi/ngFileStruct

(cleanup) resolves more merge conflicts