updated
Merge branch 'master' of github.com:cs371p-fall-2014/allocator-tests