Solve merge conflict, Added new styles
Merge branch 'master' of https://github.com/rhythm-section/vier-gewinnt
More styles
Solve merge conflict