setting my branch on master level
layout changes
layout changes
layout changes und so
Merge branch 'kevin'

Conflicts:
	css/style.css
	index.html
	js/functions.js