Merged latest merge from old client repo into new client repo. See old repo for commit messages
Reverted to localhost:3000 for base URLs for now in index.html and main.js. Modified home template and custom_general.js
Merge pull request #6 from raielin/merging_old_repo_with_new_repo

Merging old repo with new repo