Work plan update

Change to academic week number as deliverable date.
Add Gantt chart of work plan.
Add a couple of contingencies.
Minor refactor overall.