Blau machen.
Merge pull request #5 from ep-aurban/feature/create-merge-conflict

Feature/create merge conflict
Merge remote-tracking branch 'upstream/develop' into feature/Change_H1_to_red

Conflicts:
	style.css