test commit
noch nen test commit
Merge remote-tracking branch 'origin/julian'
initial layout changes
Merge branch 'master' into kevin

Conflicts:
	index.html
conflict resolved
initial layout changes
Merge remote-tracking branch 'origin/julian'
layout changes
Merge branch 'master' of https://github.com/Blackimp/FinalProject

Conflicts:
	index.html
fix git comments
layout changes #4
Create README.md
in'

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