simple.html.orig

<!DOCTYPE html>
<head>
	<title></title>
	<link rel="stylesheet" href="css/bootstrap.min.css">
	<style>
		body {
			padding-top: 50px;
			padding-bottom: 20px;
		}
	</style>
	<link rel="stylesheet" href="css/bootstrap-theme.min.css">
</head>
<body>
	<main class="container">
	<!-- Content Goes Here -->
		<p>
			This is Mohit Text, Conflict Scenerio 
		</p>
	</main>
	<footer class="container">
<<<<<<< HEAD
		<p>&copy; Company 2014, 2016</p>
=======
		<p>&copy; Company 2014, This is branch is puch for master</p>
>>>>>>> newtest
	</footer>
</body>
</html>