커밋
Merge branch 'master' of github.com:wracker1/iStoryBall

Conflicts:
	iStoryBall/Controller/Menu/MenuViewController.swift