journal update
Merge branch 'master' of github.com:ohearnk/CS467

Conflicts:
	.gitignore