Merge branch 'master' into pretty_and_close

Conflicts:
	index.html
Merge pull request #7 from mlantz/pretty_and_close

iOS web formatting & display string pretty-fication