rsr
Merge branch 'master' of https://github.com/daniloadventista/LeagueOfObjectOriented

Conflicts:
	LOOL/LOOL/LOOLViewController2.h