i fixed the server or smth hopefully haha
Merge branch 'master' of https://github.com/charles-meyer/gph

Conflicts:
	scripts/script.js