<commit_before><!DOCTYPE html>

<html>
	<head>
		<title>ConQuiz</title>
		<!-- META TAGS for mobile devices -->
		<meta name="viewport" content="initial-scale=1.0, width=device-width" />
		<meta http-equiv="Content-Security-Policy" content="default-src * 'unsafe-eval' 'unsafe-inline'; style-src * 'unsafe-inline'; media-src *">
		<!-- HERE MAPS API -->
		<script type="text/javascript" src="https://js.api.here.com/v3/3.0/mapsjs-core.js"></script>
		<script type="text/javascript" src="https://js.api.here.com/v3/3.0/mapsjs-service.js"></script>
		<script type="text/javascript" src="https://js.api.here.com/v3/3.0/mapsjs-mapevents.js"></script>
		<!-- STYLESHEETS -->
		<link rel="stylesheet" type="text/css" href="style/reset.css">
		<link rel="stylesheet" type="text/css" href="style/main.css">
		<link href='https://fonts.googleapis.com/css?family=Titillium+Web:900|Source+Sans+Pro:400,700,400italic,700italic' rel='stylesheet' type='text/css'>
		<!-- IMPORTED SCRIPTS -->
		<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
		<!--<script src='https://cdn.firebase.com/js/client/2.2.1/firebase.js'></script>-->
		<style type="text/css">

			div#map-container{
				width: 100vw;
				height: 80vh;
			}

			textarea{
				width: 100vw;
				height: 10vh;
			}

		</style>
	</head>
	<body>

		<header id="menu" onclick="toggleMenu();">
			<center>
				<img id="logo" src="style/img/goldLogo.png">
			</center>
		</header>
		<div class="headerSpace"></div>

		<div class="sidebar closed" id="sidebar-towers">
			<h1>Towers</h1>
			<p>The number indicates the radius size around each tower.</p>
			<center>
				<div class="wrapper" id="preset-towers"></div>
			</center>
		</div>

<<<<<<< HEAD
		<div class="sidebar closed" id="sidebar-questions">
			<h1>Towers</h1>
			<p>The number indicates the radius size around each tower.</p>
			<center>
				<div class="wrapper" id="battle-questions"></div>
			</center>
		</div>
		
=======
>>>>>>> origin/master
		<div id="map-container"></div>

	<div style="display:none">

		<h2>players</h2><textarea id="output-players"></textarea>
		<h2>towers</h2><textarea id="output-towers"></textarea>
		<h2>troops</h2><textarea id="output-troops"></textarea>
		<h2>questions</h2><textarea id="output-questions"></textarea>

		<textarea id="stack-log"></textarea>

	</div>

		<footer>
			<textarea id="public-log"></textarea>
		</footer>

		<script type="text/javascript" src="frontend.js"></script>
		<!--<script type="text/javascript" src="backend.js"></script>-->

		<script type="text/javascript" src="Data/game.js"></script>
		<script type="text/javascript" src="Data/task.js"></script>
		<script type="text/javascript" src="Data/player.js"></script>
		<script type="text/javascript" src="Data/tower.js"></script>
		<script type="text/javascript" src="Data/troop.js"></script>
		<script type="text/javascript" src="Data/question.js"></script>

		<script type="text/javascript" src="geolocation.js"></script><commit_msg>Cleaned up merger<commit_after><!DOCTYPE html>

<html>
	<head>
		<title>ConQuiz</title>
		<!-- META TAGS for mobile devices -->
		<meta name="viewport" content="initial-scale=1.0, width=device-width" />
		<meta http-equiv="Content-Security-Policy" content="default-src * 'unsafe-eval' 'unsafe-inline'; style-src * 'unsafe-inline'; media-src *">
		<!-- HERE MAPS API -->
		<script type="text/javascript" src="https://js.api.here.com/v3/3.0/mapsjs-core.js"></script>
		<script type="text/javascript" src="https://js.api.here.com/v3/3.0/mapsjs-service.js"></script>
		<script type="text/javascript" src="https://js.api.here.com/v3/3.0/mapsjs-mapevents.js"></script>
		<!-- STYLESHEETS -->
		<link rel="stylesheet" type="text/css" href="style/reset.css">
		<link rel="stylesheet" type="text/css" href="style/main.css">
		<link href='https://fonts.googleapis.com/css?family=Titillium+Web:900|Source+Sans+Pro:400,700,400italic,700italic' rel='stylesheet' type='text/css'>
		<!-- IMPORTED SCRIPTS -->
		<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
		<!--<script src='https://cdn.firebase.com/js/client/2.2.1/firebase.js'></script>-->
		<style type="text/css">

			div#map-container{
				width: 100vw;
				height: 80vh;
			}

			textarea{
				width: 100vw;
				height: 10vh;
			}

		</style>
	</head>
	<body>

		<header id="menu" onclick="toggleMenu();">
			<center>
				<img id="logo" src="style/img/goldLogo.png">
			</center>
		</header>
		<div class="headerSpace"></div>

		<div class="sidebar closed" id="sidebar-towers">
			<h1>Towers</h1>
			<p>The number indicates the radius size around each tower.</p>
			<center>
				<div class="wrapper" id="preset-towers"></div>
			</center>
		</div>

		<div class="sidebar closed" id="sidebar-questions">
			<h1>Towers</h1>
			<p>The number indicates the radius size around each tower.</p>
			<center>
				<div class="wrapper" id="battle-questions"></div>
			</center>
		</div>
		
		<div id="map-container"></div>

	<div style="display:none">

		<h2>players</h2><textarea id="output-players"></textarea>
		<h2>towers</h2><textarea id="output-towers"></textarea>
		<h2>troops</h2><textarea id="output-troops"></textarea>
		<h2>questions</h2><textarea id="output-questions"></textarea>

		<textarea id="stack-log"></textarea>

	</div>

		<footer>
			<textarea id="public-log"></textarea>
		</footer>

		<script type="text/javascript" src="frontend.js"></script>
		<!--<script type="text/javascript" src="backend.js"></script>-->

		<script type="text/javascript" src="Data/game.js"></script>
		<script type="text/javascript" src="Data/task.js"></script>
		<script type="text/javascript" src="Data/player.js"></script>
		<script type="text/javascript" src="Data/tower.js"></script>
		<script type="text/javascript" src="Data/troop.js"></script>
		<script type="text/javascript" src="Data/question.js"></script>

		<script type="text/javascript" src="geolocation.js"></script>
{'fraction_non_alphanumeric': 0.21751459549624688, 'fraction_numerical': 0.018015012510425355, 'mean_word_length': 4.387241689128482, 'pattern_counts': {'":': 0, '<': 212, '<?xml version=': 0, '>': 212, 'https://': 12, 'lorem ipsum': 0, 'www.': 0, 'xml': 0}, 'pii_count': 0, 'substrings_counts': 0, 'word_list_counts': {'cursed_substrings.json': 0, 'profanity_word_list.json': 0, 'sexual_word_list.json': 0, 'zh_pornsignals.json': 0}}
{'dir': 'git-commits-cleaned', 'id': '6558108', 'n_tokens_mistral': 2458, 'n_tokens_neox': 2118, 'n_words': 335}