ignoring the social network
Merge branch 'master' of github.com:noslouch/shanghai-home

Conflicts:
	.gitignore
tweaked gitignore to actually ignore files
Merge branch 'master' of github.com:noslouch/shanghai-home

Conflicts:
	.gitignore
Merge branch 'master' of github.com:noslouch/shanghai-home into library