Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
preloaded lettering.js
Merge pull request #56 from rishy/master

preloaded lettering.js
Merge remote-tracking branch 'upstream/master'

Conflicts:
	index.php