Deprecated, use Apostrophe 2!
Merge branch 'master' of github.com:boutell/jotwiki

Conflicts:
	README.md