Merge pull request #136 from unlimitedbacon/master

Modify wrapStr to use bounding box
Fix measureChar and measureString

Closes #137
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/01/text.asm