simple.html

<!DOCTYPE html>
<!--
Copyright notice added.
-->
<head>
	<title>Updating title for stash exercice</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 new stuff, from master
			Trouble here !
			Adding additional stuff after apply stash
		</p>
	</main>
	<footer class="container">
		<p>&copy; My Great Company. All rights reserved. 2014</p>
	</footer>
</body>
</html>