project preview on github
Merge branch 'master' into gh-pages

Conflicts:
	README.md
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
merge
merge conflicts
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge pull request #14 from temkin/gh-pages

publish