Update 2000-01-02-the-box.markdown
Remove lingering video
Merge branch 'gh-pages' of github.com:p2pu/course-in-a-box into ercchy
Remove lingering video
Add week 1 email to site
Add missing image
Add title
Update course.yml
Update course.yml
Merge pull request #45 from matt5834/gh-pages

Added Picture
Update course.yml
fixing the calendar rendering
Merge branch 'gh-pages' of https://github.com/ercchy/course-in-a-box into ercchy
Revert indentation changes, closes #46
Merge branch 'gh-pages' of github.com:dirkcuys/course-in-a-box into ercchy
Remove accidental variable in header
Merge pull request #47 from dirkcuys/gh-pages

Merge changes from Erika for calendar to work again
Update course.yml

added myself
Merge branch 'gh-pages' of https://github.com/mrjohnc/course-in-a-box into mrjohnc

Conflicts:
	_data/course.yml
Merge branch 'mrjohnc' into gh-pagesa. Closes #48