Fix Bug
Merge branch 'master' of github.com:Draveness/SportJoin

Conflicts:
	STKUserTableViewController.m