- Merge changes.
Merge branch 'master' of github.com:IcyInsanities/CS101B

Conflicts:
	src/vm/falloc.h
- Frame allocator compiles.