Merge pull request #2 from PopShack/homePage

Home page
Merge pull request #3 from PopShack/develop

Merge pull request #2 from PopShack/homePage