Included Activity Stack and week4 modifications
Merge branch 'master' of https://github.com/lrehmann/cahoot

Conflicts:
	draftprojectproposal.pdf