solve conflicts

Author: viditvarshney

README.md

@@ -1,2 +1,33 @@
-# Reaction-Timer-
-This is the game based on javascript which notes your reaction time , you have to very attentive towards it ......  So  check and play .
+# Reaction-Timer-
+This is the game based on javascript which notes your reaction time , you have to very attentive towards it ......  So  check and play .
+Live at https://reactiontimer.tk   ( Renewal Needed )
+ 
+
+# 
+***
+# Welcome to the **"Reaction-Timer"**
+***
+
+This is the game which will make you attentive with the game . It is very interesting when you bored ...
+***
+
+
+## You have to click the shapes as fast  as you can , your time of response wil be automatically noted and displayed on the left hand side
+
+***
+> Here are the screenshots of the Game !...
+
+  ![reaction](https://user-images.githubusercontent.com/34159717/43367366-62ade7a8-9369-11e8-9d52-aabe76f742d7.JPG)
+Screenshot 1
+
+![reaction1](https://user-images.githubusercontent.com/34159717/43367367-63108aca-9369-11e8-96a6-ba5fc79201bb.JPG)
+Screenshot 2
+
+## You are most welcome to modify and give the suggestions .. If You find any mistake or error then make a pull request or inform to me ..
+***
+### - Leave your Error or anything want to know , get connected on gitter Click the Link
+[![Join the chat at https://gitter.im/Reaction-Timer/Lobby](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/Reaction-Timer/Lobby)
+
+# Programming Languages Used Here Are :
+* Javascript
+* HTML & CSS 

script.js

@@ -70,4 +70,4 @@ document.getElementById("shape").onclick = function() {
 
 
     Timeout();
-}
+}

style.css

@@ -10,4 +10,4 @@ position: relative;
 .bold {
 font-weight: bold;
 color:red;
-}
+}