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 branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
commit out current time

see if this fixed sound on iPad
Merge branch 'master' into gh-pages

Conflicts:
	index.html
resolve merge error
change tab to space..
Place solution canvas before tile canvas

and center both horizontally
Merge branch 'gh-pages'