#2 友達一覧に移動
Merge branch 'master' of github.com:SheepYo/HAYO

Conflicts:
	iOS/Sheep/Account.swift
	iOS/Sheep/LoginViewController.swift