updated gitignore, new branch
new config files
modified config
test commit
test commit from local machine
fixed misbehaving config file
test commit
Merge branch 'master' into develop
Merge branch 'master' of github.com:noslouch/shanghai-home into develop

Conflicts:
	.gitignore