Changed Margin on Index.Html
merging
Fixing Merge Conflict
Lightbox Implementation with a side of Martins