Merge branch 'develop' into feature/add-even-more-styles

Conflicts:
	style.css

Add second style

Add third style
Merge branch 'feature/add-even-more-styles' of https://github.com/aleksanderson/git-workflow-playground into feature/add-even-more-styles

Conflicts:
	style.css