Removed temporary files
Ignore temporary files
Merge pull request #29 from matnel/fix-issue-11

Fix issue 11
added office hours
added my info to roster
Merge pull request #31 from annaswigart/master

Added info for Anna Swigart to the roster.md document
added openoakland.org and civicrm.org to projects page
Merge pull request #32 from leesajay/project_updates

added openoakland.org and civicrm.org to projects page
switched lab sessions
added Khan Academy to the project list
added my name/info to the roster
specify PhD program
Merge pull request #36 from npdoty/master

added npdoty name/info to the roster
added name to roster
Merge pull request #37 from nyborrobyn/master

added name to roster
Update lab1.md
update HTML.  need to get that hook in...
add tech-and-community slides