Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Fixed typo on commarchpreso key
Added link for hfoss sugar bundle (fixed #548)
Added meetups
Added links to meetup 1 (oops) and the commarch presentation
Added a new bugfix
meetup2 & curriculum

Added meetup2 and curriculum blog posts
Added Hudl and Curriculum posts
Add team propposal for XO Project
Update MrNex.yaml

Added second developer event.
Added teamprop2
Changed bugfix1 to bugfix
Added teamprop2 for team project proposal
added link to second team proposal & curriculum
Updated formatting for sugarlabs bundle in syllabus
Added teamprop2
Merge remote-tracking branch 'upstream/master'
Added link for curriculum
Merge remote-tracking branch 'decause/master'

Conflicts:
	scripts/people/2014/fall/Honeybunch.yaml
Added link for Curriculum Examination
Merged from master