Merge pull request #1 from keroserene/master

merge this yo
Merge pull request #2 from keroserene/master

meow
awesome macterm hack!
Merge branch 'master' of github.com:jart/hiptext

Conflicts:
	hiptext.cc
make macterm rendering much better! but still much room for improvement!
last supper screenshot
happy cat screenshot
pending
Merge branch 'master' of github.com:jart/hiptext
cmdline interface beginnings, file extension