update
Merge https://github.com/tsetso-bg/FUN-WEB-Timework

Conflicts:
	css/jokes-css.css
Merge https://github.com/tsetso-bg/FUN-WEB-Timework