Start view
Merge remote-tracking branch 'origin/master'

Conflicts:
	Shifumi/.idea/workspace.xml