primer commit
Merge pull request #1 from meddia/home

primer commit
Merge pull request #2 from meddia/features

Features
Merge pull request #3 from meddia/develop

Develop