Revert "Merge branch 'master' of https://github.com/tituszban/FantasyGameBS"

Conflicts:

FantasyGameBS.xcodeproj/project.xcworkspace/xcuserdata/p0w3r_us3r.xcuser
datad/UserInterfaceState.xcuserstate
	FantasyGameBS/Base.lproj/Main.storyboard
	FantasyGameBS/GameViewController.h
	FantasyGameBS/GameViewController.m