_style.css added.
Merge remote-tracking branch 'origin/master'

Conflicts:
	teknik-data/html/css/main.css