styles.css revert to 2:30pm

overwrite committed css to the version at GitHub before I tried to
resolve conflict/merge
style.css  updated merge conflict

merge conflict and command issues
Merge remote-tracking branch 'origin/master'

Conflicts:
	style.css