general css added
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/general.css
general css added