Create style.txt
Update style.txt
Merge remote-tracking branch 'origin/style'

Conflicts:
	style.txt