Merge branch 'master' of https://github.com/riceman225/sitejustfor.me

Conflicts:
config.php
no config