sb467 thing
Merge branch 'master' of https://github.com/Restore4thSF/restore4thsf.github.io

Conflicts:
	events/aaron-swartz-memorial-hackathon/index.html

events/att-community-outreach-and-construction-and-engineering-teams/ind
ex.html
	events/baythreat-2013/index.html
	events/board-of-supervisors-meeting/index.html
	events/constitution-day-panel/index.html

events/could-it-happen-here-little-brother-in-san-francisco-2013/index.h
tml

events/first-unitarian-church-los-angeles-v-nsa-case-management-hearing/
index.html
	events/gpg-encryption-worksho/index.html

events/inet-san-francisco-panel-public-policy-and-the-fourth-amendment/i
ndex.html

events/institute-for-the-future-co-presence-online-offline-event/index.h
tml
	events/jewel-v-nsa-meeting/index.html

events/meeting-for-actual-presence-and-copresence-at-the-1026-rally/inde
x.html
	events/nsa-surveillance-what-we-know-what-to-do-about-it/index.html
	events/rally-against-mass-spying-copresence-event/index.html
	events/restore-the-fourth-san-francisco-strategy-meeting/index.html
	events/san-francisco-meshnet-project-3/index.html
	events/san-francisco-meshnet-project-6/index.html
	events/san-francisco-meshnet-project/index.html
	events/san-francisco-resolution-project/index.html
	events/san-francisco-restore-the-fourth-protest/index.html
	events/senate-select-committee-on-intelligence-hearing/index.html
	events/sf-project-patriot-event/index.html
	events/silicon-valley-rightscon-2014/index.html
	events/stop-watching-us-rally-against-mass-spying/index.html
	events/sudo-room-encryption-workshop/index.html
	events/sudo-room-wifi-mesh-general-meeting/index.html
	events/techno-activism-third-mondays-meetup/index.html
	events/test-page/index.html
	events/third-open-strategy-meeting/index.html
	events/unitarian-universalists-v-nsa-case-management-hearing/index.html
	events/universal-encrpytion-step-1-planning-meeting/index.html
	events/weekly-resolution-workgroup/index.html
	locations/211-hart-senate-office-building/index.html
	locations/cato-institute/index.html
	locations/celtic-cafe/index.html
	locations/city-hall/index.html
	locations/cnet-headquarters/index.html
	locations/electronic-frontier-foundation/index.html
	locations/institute-for-the-future/index.html
	locations/main-library/index.html
	locations/noisebridge-2/index.html
	locations/noisebridge-3/index.html
	locations/noisebridge/index.html
	locations/peets-coffee-and-tea/index.html
	locations/richland-and-mission/index.html
	locations/san-francisco-state-university/index.html
	locations/somewhere-in-the-bay-area/index.html
	locations/sudo-room/index.html
	locations/sudoroom/index.html
	locations/tba-2/index.html
	locations/tba/index.html
	locations/tbd/index.html
	locations/un-plaza/index.html

locations/united-states-district-court-northern-district-of-california/i
ndex.html
	locations/unknown/index.html
	locations/wichcraft/index.html
	sitemapseo.xml