Added Angular, moved server files into own folder

Added Angular and files for Angular use (located in the app folder).
Also created a basic template and a test Angular controller in app.js
Added file serving capability.

Deleted garbage merge data, added file serving capabilities to index.js.
Revert "Added file serving capability."

This reverts commit 2bb283b317e8905e7674d922d4bcb3c7556c62c1.
Added Vim Swp files to Gitingore.
Revert "Revert "Added file serving capability.""

This reverts commit 47e44285ae7456f0eed07c663ac5e8771ee4e96e.
Fixing gitignore issue

Making new commit to allow gitignore to delete swp files.