Add changes in the dev branch

2 changed files with 13 additions and 0 deletions
--- a/index.html
+++ b/index.html
@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<title>Mit-Merge</title>
+	</head>
+
+	<body>
+		<h1>Hi I'm from the master branch.</h1>
+		<p>Hi this edit is from master branch.</p>
+	</body>
+</html>
--- a/trial.html
+++ b/trial.html