diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..7a3094a
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,11 @@
+DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+Version 2, December 2004
+
+Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
+
+Everyone is permitted to copy and distribute verbatim or modified copies of this license document, and changing it is allowed as long as the name is changed.
+
+DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. You just DO WHAT THE FUCK YOU WANT TO.
diff --git a/README.md b/README.md
index 7037ed9..e26e146 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 # qwik-register
 
+<<<<<<< HEAD
 ## GLAuth installation
 
 ```
@@ -59,4 +60,7 @@ INSERT INTO groups(name, gidnumber) VALUES('admins', 10);
 INSERT INTO groups(name, gidnumber) VALUES('root', 100);
 
 INSERT INTO includegroups(parentgroupid, includegroupid) VALUES(10, 0);
-```
\ No newline at end of file
+```
+=======
+A really cool registration page, I promise <3 
+>>>>>>> 429ce54fd89747f18c33167175c8c0531fee9627