funfa
Merge branch 'master' of https://github.com/lordareonz/League-Of-Code

Conflicts:
	League of
Code.xcodeproj/project.xcworkspace/xcuserdata/rogeriobordignon.xcuserdat
ad/UserInterfaceState.xcuserstate