Allocate
Merge branch 'Nicks' of github.com:n2westman/CS111 into Nicks