Mess with CSS a little
Merge branch 'master' of https://github.com/greigm/clubfare

Conflicts:
	current