add arena
Merge branch 'master' of https://github.com/eduardolomb/LeagueOfObjectOriented

Conflicts:
	LeagueOfObjectOriented.xcodeproj/project.pbxproj