Edited CSS of pages
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/Sport.css
	html/Sport.html
	html/education.html
	html/jokes.html