Changed site.conf
Merge branch 'master' of https://github.com/Indiv0/tranquill