Fixed bug by moving flags to outer struct
Merge branch 'master' of https://github.com/ucsc-cs111-spr-2014/cs111-project-3

Conflicts:
	slugmalloc.c
	slugmalloc.h
	testing.c