d
Merge branch 'master' of https://github.com/kakawka/ordinarbet

Conflicts:
	app/views/statistics/new.html.erb
update