new coomit
Merge branch 'master' of https://github.com/BnV/lib

Conflicts:
	index.html
	liba.js