merge in progress
Merge branch 'master' into samson
w/e
idk
Merge branch 'samson' of https://github.com/OPUSNYC/opus_dopusNYC into junwoo

Conflicts:
	src/details.html
	src/editprofile.html