Merge pull request #4 from OPUSNYC/junwoo

YAY STYLING IS DONE
fixed map bug
Merge pull request #5 from OPUSNYC/junwoo

fixed map bug
idk
Merge branch 'samson' of https://github.com/OPUSNYC/opus_dopusNYC into junwoo
idk
idk
trying to upload prof
Merge branch 'master' of https://github.com/OPUSNYC/opus_dopusNYC
Merge branch 'master' of https://github.com/OPUSNYC/opus_dopusNYC into junwoo
fixed json
profile pic
Signed-off-by: jwoos <shin.junwoo97@gmail.com>
Merge branch 'junwoo' of https://github.com/OPUSNYC/opus_dopusNYC into junwoo

Conflicts:
	local_config.json
json sucks
asdx