test commit
initial layout changes
Merge branch 'master' into kevin

Conflicts:
	index.html
conflict resolved
layout changes
layout changes #4
in'

Conflicts:
	css/style.css
	index.html
git ist mist
Merge branch 'master' of https://github.com/Blackimp/FinalProject