config and files to run on shared hosting
Merge remote branch 'origin/master'