add index file
fix background
fix background
fix merge conflict
Merge pull request #3 from charliegerard/master

Master