test

commit
Merge branch 'toibalo' of https://github.com/tdkhanhvu/green into toibalo

Conflicts:
	js/avatar-template.js