step
e branch 'master' of https://github.com/NiallTsao/AlphaTeam

Conflicts:
	AlphaTeam/Base.lproj/Main.storyboard