Fixed url
Merge branch 'master' of https://github.com/agregers/layout-challenge

Conflicts:
	css/main.css
	index.html