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
Add Hudl meetup post for dropofwill
Add bugfixupstream for merged pull request for dropofwill
Add curriculum post to dropofwill.yaml
Added links to meetup 1 (oops) and the commarch presentation
Merge branch 'master' of github.com:decause/hflossk
Add teamprop2 to dropofwill
Update bugfixupstream key to upstream1
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
added curriculum and team prop 2