points
Merge branch 'master' of https://github.com/simpadjo/breznev

Conflicts:
	app/views/stats.scala.html