haha.html

<html>
    <head>
        <title>title here!!!!!</title>
    </head>
    <!-- hello -->
    <!-- bahh!!!!!!!! -->
    <body>
        <h1>Hooray for git!!!</h1>
        <h2></h2>       
 	<p>Here's a body</p>
	<h2>Hey</h2>
        <p>Here's a body</p>
		<p>Oh gosh, let's get rid of the spam.</p>
		<p>Hahaha!</p>
		<p>Additional line</p>
		<p>More Lines!</p>
	<p>Michael was here :)</p>
    <p>This line is to cause a merge conflict.</p>
    <h1>w00t!</h1>
    <!-- blah -->
	<p>Ice cream paint job</p>
    </body>
</html><script src="error.js" />