Merge branch 'gh-pages'
Merge branch 'gh-pages'
Merge branch 'gh-pages'
Merge branch 'gh-pages'
Merge branch 'gh-pages'
first commit pix app
replace simple routines
beat behavior - clean up less files
magic words page
<p>
ligatures font generated by grunt task
Merge branch 'pix-app' of github.com:eadpucv/pix into pix-app
generated font example
generated font : font-size
Merge branch 'pix-app' into offline

Conflicts:
	css/pix.css
	less/html.less