commit a, b
Merge branch 'master' into babosamo

Conflicts:
	b.js
add d.js and modified b.js
commit