forgot to git add *, added .htacces
Merge branch 'master' of https://github.com/Marwolf/Wolf-Kingdom