1 files changed, 4 insertions, 0 deletions

diff --git a/README.md b/README.md
index c3bb151..c417f53 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,6 @@
+<<<<<<< HEAD
 OpenSkyPlanetarium plugin for Stellarium
+Low cost hardware and open source software setup for planetariums in schools.
 =====================================
 
 Plugin for controlling the Arduino-Based Laser and Stellarium to create Planetarium shows.
@@ -33,3 +35,5 @@ If all goes well, the relevant files should be built and copied to your
 ~/.stellarium/modules directory.
 
 
+======= 
+