add game_over.erb
merge master with frank