IDK
IDK
Merge remote-tracking branch 'origin/master'

Conflicts:
	app.js
	model/dbConnection.js

	node_modules/mysql/node_modules/readable-stream/node_modules/string_decoder/build/node_modules/hyperdirect/README.md

	node_modules/mysql/node_modules/readable-stream/node_modules/string_decoder/build/node_modules/hyperdirect/index.js