fixes
Merge branch 'master' of https://github.com/arehayem/ECE464

Conflicts:
	database.js
	requestHandlers.js