commit
github sync
git sync
Merge branch 'samson' of https://github.com/OPUSNYC/opus_dopusNYC into samson
Merge branch 'samson'

Conflicts:
	local_config.json
	src/details.html
	src/js/parseCode.js