Merge pull request #1 from PopShack/develop

Develop
Merge pull request #5 from PopShack/develop

Develop
Merge pull request #6 from PopShack/develop

Update index.php
Deleted CodeKit generated file
Deleted CodeKit generated file
Merge branch 'master' into develop