Upload Week 7 content
Comment out Week 8 organization assignment.  Will be replaced with Capstone content.
Add Week 8 assignment content
Insert word Capstone for Week 7 and 8
Merge branch 'master' into staging

Fixed merge conflict by sticking with staging version of routes.  We'll
update master soon to match.

Conflicts:
	config/routes.rb