Remove unecessary <ul> in entertainment

Also, fix the link from the index which pointed to 'music.html'
Indention fix in entertainment page
Remove <ul>s in pets page
Merge branch 'master' of https://github.com/borkabrak/qf_test

Conflicts:
	entertainment.html