Solved Merge-Problems, Added style.css