added index file
resolved conflicts
Merge pull request #1 from mttdffy/feature/awesome

Doing it up