make profile
Merge branch 'master' into yasuhiro

Conflicts:
	index.html
Merge branch 'yasuhiro'