Bad Code
updating html
Merge branch 'temp'
Everything up until the images