echo add
Merge branch 'master' of https://github.com/kurosaka/test

Conflicts:
	add2.php

Signed-off-by: kurosaka <kurosaka@seoaxis.com>