removed conflicted files and garbage ~
Merge branch 'master' of https://github.com/fibice3/betlab

Conflicts:
	app/views/bets/mathima1.html.erb~
	app/views/bets/mathima2.html.erb~
	app/views/layouts/application.html.erb~
	app/views/widgets/_navigation.html.erb~
	config/routes.rb~
	db/seeds.rb~