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

Conflicts:
	src/threads/fmalloc.c
	src/threads/palloc.c
Merge branch 'master' of github.com:IcyInsanities/CS101B

Conflicts:
	src/threads/palloc.c