Add index
Add htaccess
Merge branch 'new-feature' of https://github.com/brenelz/Test into develop