Merge pull request #33 from pcs-groupProject/kellen

Kellen
Added kew to package.json and bundle.js to .gitignore
Fake login added. Also, if statement added to the timer to keep it from firing all the time
merge!
Merge pull request #35 from pcs-groupProject/jwt

Jwt
synching up
merge conflicts resolved