user1 m
Merge branch 'master' of github.com:konyuta/first-rep

Conflicts:
	index.php
user1 info add
Merge pull request #2 from konyuta/design/info-suport

Design/info suport