Merge branch 'master' of https://github.com/dopefishh/kvltpr0lvg

Conflicts:
	caspartest

diff --cc caspartest~
index 0000000,0000000..2024b2d
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/caspartest~
@@@ -1,0 -1,0 +1,5 @@@
++<<<<<<< HEAD
++hallo dit is raar
++=======
++hoi neger
++>>>>>>> 066f320c3074b4208de85c8b555c4c7408452b4f