Add preliminary package.json and server.js
Pull from upstream master
fix rebase conflicts
add depoy.sh and .deployment file
removed bcrypt from package.json
Fix bcrypt comment
added server.js to root folder
add deploy.sh
add server.js to main in package.json
add app.js
delete app.js
add test route
added script to package.json to execute node server/server.js on azure
Edit package.json to resolve rebase conflicts
Merge pull request #58 from armandopmj/test/deploy

(feat) Add script to package.json to properly deploy server
(refactor) Refactor ab_test, query, and timer files. Add <script> tags for all states in index.html. Adds controllers for each state in app.config.js.
Merge pull request #60 from lmle/feat/client/refactor

(refactor) Refactor ab_test, query, and timer files. Add <script> tags f...