fixed json
Merge branch 'junwoo' of https://github.com/OPUSNYC/opus_dopusNYC into junwoo

Conflicts:
	local_config.json
json sucks
asdx
profile pic
Merge branch 'samson' of https://github.com/OPUSNYC/opus_dopusNYC into junwoo

Conflicts:
	local_config.json