Merge branch 'master' of /home/ycra/website
-rw-r--r-- 94 .gitignore
-rw-r--r-- 248 config.php.sample
drwxr-xr-x - public_html