Merge pull request #23 from xxSandiLLyxx/skills_on_splash

Skills on splash
Merge pull request #24 from xxSandiLLyxx/skills_on_splash

Splash 98% done yes
rebased from master