(bug) add comma in schema.sql
(bug) add crypto to the dependencies
Merge pull request #21 from Neco-Murphy/bug/schemaAndNpm

(bug) fix schema and  add npm dependency
(bug) change password for mysql
Merge pull request #22 from Neco-Murphy/bug/password

(bug) change password for mysql
(bug) add a middleware to allow cross origin
Merge pull request #23 from Neco-Murphy/bug/deploy

(bug) add a middleware to allow cross origin
(bug) fixed friend adding friend requests when already friends
Merge pull request #24 from bace135/debug/multiple-contents

(bug) fixed friend adding friend requests when already friends
Merge branch 'master' of https://github.com/Votally/server into deploy

Conflicts:
	server.js