Something is not working...
Merge branch 'gh-pages' of https://github.com/smalldelta/matrix into gh-pages
Struggling with git...
Working on solving function.
Merge branch 'master' into gh-pages

Conflicts:
	js/ui.js
Merge branch 'gh-pages'
Added function ref. in index.html.