Mostly replaced font rendering
Merge branch 'master' of https://github.com/ertyseidel/cyberpunk

Conflicts:
	script.js