Alvin Ranking
Merge branch 'master' into Alvin
fix
git merge alvin
commit merge
libs fix
Merge branch 'Alvin'

Conflicts:
	index.html
	ranking.html
ranking fix
Merge branch 'dennis'

Conflicts:
	css/screen.css
	css/style.css
	index.html
	js/app/models/match.js
	js/app/views/poolView.js
Merge remote-tracking branch 'origin/master' into dennis