basic setup

This commit is contained in:
ang-st 2015-03-30 22:05:02 +01:00
commit 2c6746c0a9
2 changed files with 9 additions and 0 deletions

View File

@ -1,4 +1,10 @@
<<<<<<< HEAD
#kitteh wiki
simple wiki for thsf site
=======
###wiki tshf
this is thsf wiki, all datas here are public.
>>>>>>> 22a89ddac499fcafc0cabd1b0df2a39b6bd794ac

3
index Normal file
View File

@ -0,0 +1,3 @@
###Hello THSF
![](http://stuffpoint.com/lol-cats/image/29077-lol-cats-magical-kitteh.png)