Added Andrew McConachie to the roster file.
Fixed CR NL in roster.md
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
updating the roster with my info as somehow it didn't work the first time
correcting bad dates on syllabus
add information about assignment 1
update HTML
update html on changes to assign1
Merge remote-tracking branch 'upstream/master'

Conflicts:
	content/pages/roster.md
First try at assignment 1.