type scales with images
Merge branch 'master' of https://github.com/antonioono/Lunar-Gala-Website

Conflicts:
	Promo/index.html
	Promo/style/screen.css