Add computer-specific config file
Add my_config.js to .gitignore
Merge remote-tracking branch 'origin/master'