aa
Merge branch 'master' of https://github.com/hodaka0124/test

Conflicts:
	index.php
	index2.php